Commit 17d27893 authored by Stephen Kelly's avatar Stephen Kelly

cmState: Port dependent code to new cmStateDirectory name

parent 34bcec39
Pipeline #31625 passed with stage
......@@ -1415,13 +1415,13 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
}
cmLinkLineComputer* cmGlobalGenerator::CreateLinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir) const
cmOutputConverter* outputConverter, cmStateDirectory stateDir) const
{
return new cmLinkLineComputer(outputConverter, stateDir);
}
cmLinkLineComputer* cmGlobalGenerator::CreateMSVC60LinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir) const
cmOutputConverter* outputConverter, cmStateDirectory stateDir) const
{
return new cmMSVC60LinkLineComputer(outputConverter, stateDir);
}
......
......@@ -108,10 +108,10 @@ public:
virtual void Generate();
virtual cmLinkLineComputer* CreateLinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir) const;
cmOutputConverter* outputConverter, cmStateDirectory stateDir) const;
cmLinkLineComputer* CreateMSVC60LinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir) const;
cmOutputConverter* outputConverter, cmStateDirectory stateDir) const;
/**
* Set/Get and Clear the enabled languages.
......
......@@ -66,7 +66,7 @@ void cmGlobalNinjaGenerator::WriteComment(std::ostream& os,
}
cmLinkLineComputer* cmGlobalNinjaGenerator::CreateLinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory /* stateDir */) const
cmOutputConverter* outputConverter, cmStateDirectory /* stateDir */) const
{
return new cmNinjaLinkLineComputer(
outputConverter,
......
......@@ -72,7 +72,7 @@ public:
cmLinkLineComputer* CreateLinkLineComputer(
cmOutputConverter* outputConverter,
cmState::Directory stateDir) const CM_OVERRIDE;
cmStateDirectory stateDir) const CM_OVERRIDE;
/**
* Write the given @a comment to the output stream @a os. It
......
......@@ -7,7 +7,7 @@
#include "cmOutputConverter.h"
cmLinkLineComputer::cmLinkLineComputer(cmOutputConverter* outputConverter,
cmState::Directory stateDir)
cmStateDirectory stateDir)
: StateDir(stateDir)
, OutputConverter(outputConverter)
, ForResponse(false)
......
......@@ -13,7 +13,7 @@ class cmLinkLineComputer
{
public:
cmLinkLineComputer(cmOutputConverter* outputConverter,
cmState::Directory stateDir);
cmStateDirectory stateDir);
virtual ~cmLinkLineComputer();
void SetUseWatcomQuote(bool useWatcomQuote);
......@@ -39,7 +39,7 @@ private:
std::string ConvertToOutputFormat(std::string const& input);
std::string ConvertToOutputForExisting(std::string const& input);
cmState::Directory StateDir;
cmStateDirectory StateDir;
cmOutputConverter* OutputConverter;
bool ForResponse;
......
......@@ -6,7 +6,7 @@
#include "cmSystemTools.h"
cmMSVC60LinkLineComputer::cmMSVC60LinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir)
cmOutputConverter* outputConverter, cmStateDirectory stateDir)
: cmLinkLineComputer(outputConverter, stateDir)
{
}
......
......@@ -10,7 +10,7 @@ class cmMSVC60LinkLineComputer : public cmLinkLineComputer
{
public:
cmMSVC60LinkLineComputer(cmOutputConverter* outputConverter,
cmState::Directory stateDir);
cmStateDirectory stateDir);
std::string ConvertToLinkReference(std::string const& input) const
CM_OVERRIDE;
......
......@@ -1232,7 +1232,7 @@ class cmMakefileTargetGeneratorObjectStrings
public:
cmMakefileTargetGeneratorObjectStrings(std::vector<std::string>& strings,
cmOutputConverter* outputConverter,
cmState::Directory stateDir,
cmStateDirectory stateDir,
std::string::size_type limit)
: Strings(strings)
, OutputConverter(outputConverter)
......@@ -1277,7 +1277,7 @@ private:
std::vector<std::string>& Strings;
cmOutputConverter* OutputConverter;
cmState::Directory StateDir;
cmStateDirectory StateDir;
std::string::size_type LengthLimit;
std::string CurrentString;
std::string NextObject;
......@@ -1553,7 +1553,7 @@ std::string cmMakefileTargetGenerator::CreateResponseFile(
}
cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir)
cmOutputConverter* outputConverter, cmStateDirectory stateDir)
{
if (this->Makefile->IsOn("MSVC60")) {
return this->GlobalGenerator->CreateMSVC60LinkLineComputer(outputConverter,
......
......@@ -141,7 +141,7 @@ protected:
std::vector<std::string>& makefile_depends);
cmLinkLineComputer* CreateLinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir);
cmOutputConverter* outputConverter, cmStateDirectory stateDir);
/** Create a response file with the given set of options. Returns
the relative path from the target build working directory to the
......
......@@ -5,7 +5,7 @@
#include "cmGlobalNinjaGenerator.h"
cmNinjaLinkLineComputer::cmNinjaLinkLineComputer(
cmOutputConverter* outputConverter, cmState::Directory stateDir,
cmOutputConverter* outputConverter, cmStateDirectory stateDir,
cmGlobalNinjaGenerator const* gg)
: cmLinkLineComputer(outputConverter, stateDir)
, GG(gg)
......
......@@ -13,7 +13,7 @@ class cmNinjaLinkLineComputer : public cmLinkLineComputer
{
public:
cmNinjaLinkLineComputer(cmOutputConverter* outputConverter,
cmState::Directory stateDir,
cmStateDirectory stateDir,
cmGlobalNinjaGenerator const* gg);
std::string ConvertToLinkReference(std::string const& input) const
......
......@@ -78,7 +78,7 @@ static bool cmOutputConverterNotAbove(const char* a, const char* b)
bool cmOutputConverter::ContainedInDirectory(std::string const& local_path,
std::string const& remote_path,
cmState::Directory directory)
cmStateDirectory directory)
{
const std::string relativePathTopBinary =
directory.GetRelativePathTopBinary();
......
......@@ -92,7 +92,7 @@ public:
static bool ContainedInDirectory(std::string const& local_path,
std::string const& remote_path,
cmState::Directory directory);
cmStateDirectory directory);
/**
* Convert the given remote path to a relative path with respect to
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment