reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-09 21:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: inlined files dir constant and removed it from cmake.h

Browse Source
This commit is contained in:
Bruno Manganelli 2018-11-22 21:05:05 +00:00
parent c144db1b8c
commit 3e867ed400
28 changed files with 62 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -15,7 +15,6 @@
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmWorkingDirectory.h" #include "cmWorkingDirectory.h"
#include "cmXMLWriter.h" #include "cmXMLWriter.h"
#include "cmake.h"
#include "cmsys/FStream.hxx" #include "cmsys/FStream.hxx"
#include "cmsys/Glob.hxx" #include "cmsys/Glob.hxx"
@ -2227,7 +2226,7 @@ int cmCTestCoverageHandler::GetLabelId(std::string const& label)
void cmCTestCoverageHandler::LoadLabels() void cmCTestCoverageHandler::LoadLabels()
{ {
std::string fileList = this->CTest->GetBinaryDir(); std::string fileList = this->CTest->GetBinaryDir();
fileList += cmake::GetCMakeFilesDirectory(); fileList += "/CMakeFiles";
fileList += "/TargetDirectories.txt"; fileList += "/TargetDirectories.txt";
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
" target directory list [" << fileList << "]\n", " target directory list [" << fileList << "]\n",

2
Source/CTest/cmCTestLaunch.cxx
View File

@ -282,7 +282,7 @@ void cmCTestLaunch::LoadLabels()
// Labels are listed in per-target files. // Labels are listed in per-target files.
std::string fname = this->OptionBuildDir; std::string fname = this->OptionBuildDir;
fname += cmake::GetCMakeFilesDirectory(); fname += "/CMakeFiles";
fname += "/"; fname += "/";
fname += this->OptionTargetName; fname += this->OptionTargetName;
fname += ".dir/Labels.txt"; fname += ".dir/Labels.txt";

7
Source/cmCacheManager.cxx
View File

@ -16,7 +16,6 @@
#include "cmState.h" #include "cmState.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmVersion.h" #include "cmVersion.h"
#include "cmake.h"
cmCacheManager::cmCacheManager() cmCacheManager::cmCacheManager()
{ {
@ -27,7 +26,7 @@ cmCacheManager::cmCacheManager()
void cmCacheManager::CleanCMakeFiles(const std::string& path) void cmCacheManager::CleanCMakeFiles(const std::string& path)
{ {
std::string glob = path; std::string glob = path;
glob += cmake::GetCMakeFilesDirectory(); glob += "/CMakeFiles";
glob += "/*.cmake"; glob += "/*.cmake";
cmsys::Glob globIt; cmsys::Glob globIt;
globIt.FindFiles(glob); globIt.FindFiles(glob);
@ -360,7 +359,7 @@ bool cmCacheManager::SaveCache(const std::string& path, cmMessenger* messenger)
fout << "\n"; fout << "\n";
fout.Close(); fout.Close();
std::string checkCacheFile = path; std::string checkCacheFile = path;
checkCacheFile += cmake::GetCMakeFilesDirectory(); checkCacheFile += "/CMakeFiles";
cmSystemTools::MakeDirectory(checkCacheFile); cmSystemTools::MakeDirectory(checkCacheFile);
checkCacheFile += "/cmake.check_cache"; checkCacheFile += "/cmake.check_cache";
cmsys::ofstream checkCache(checkCacheFile.c_str()); cmsys::ofstream checkCache(checkCacheFile.c_str());
@ -384,7 +383,7 @@ bool cmCacheManager::DeleteCache(const std::string& path)
cmSystemTools::RemoveFile(cacheFile); cmSystemTools::RemoveFile(cacheFile);
// now remove the files in the CMakeFiles directory // now remove the files in the CMakeFiles directory
// this cleans up language cache files // this cleans up language cache files
cmakeFiles += cmake::GetCMakeFilesDirectory(); cmakeFiles += "/CMakeFiles";
if (cmSystemTools::FileIsDirectory(cmakeFiles)) { if (cmSystemTools::FileIsDirectory(cmakeFiles)) {
cmSystemTools::RemoveADirectory(cmakeFiles); cmSystemTools::RemoveADirectory(cmakeFiles);
} }

2
Source/cmCoreTryCompile.cxx
View File

@ -394,7 +394,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv,
// compute the binary dir when TRY_COMPILE is called with a src file // compute the binary dir when TRY_COMPILE is called with a src file
// signature // signature
if (this->SrcFileSignature) { if (this->SrcFileSignature) {
this->BinaryDirectory += cmake::GetCMakeFilesDirectory(); this->BinaryDirectory += "/CMakeFiles";
this->BinaryDirectory += "/CMakeTmp"; this->BinaryDirectory += "/CMakeTmp";
} else { } else {
// only valid for srcfile signatures // only valid for srcfile signatures

2
Source/cmFileCommand.cxx
View File

@ -558,7 +558,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
if (hex_conversion_enabled) { if (hex_conversion_enabled) {
// TODO: should work without temp file, but just on a memory buffer // TODO: should work without temp file, but just on a memory buffer
std::string binaryFileName = this->Makefile->GetCurrentBinaryDirectory(); std::string binaryFileName = this->Makefile->GetCurrentBinaryDirectory();
binaryFileName += cmake::GetCMakeFilesDirectory(); binaryFileName += "/CMakeFiles";
binaryFileName += "/FileCommandStringsBinaryFile"; binaryFileName += "/FileCommandStringsBinaryFile";
if (cmHexFileConverter::TryConvert(fileName.c_str(), if (cmHexFileConverter::TryConvert(fileName.c_str(),
binaryFileName.c_str())) { binaryFileName.c_str())) {

2
Source/cmGeneratorTarget.cxx
View File

@ -6140,7 +6140,7 @@ bool cmGeneratorTarget::HasImportLibrary(std::string const& config) const
std::string cmGeneratorTarget::GetSupportDirectory() const std::string cmGeneratorTarget::GetSupportDirectory() const
{ {
std::string dir = this->LocalGenerator->GetCurrentBinaryDirectory(); std::string dir = this->LocalGenerator->GetCurrentBinaryDirectory();
dir += cmake::GetCMakeFilesDirectory(); dir += "/CMakeFiles";
dir += "/"; dir += "/";
dir += this->GetName(); dir += this->GetName();
#if defined(__VMS) #if defined(__VMS)

3
Source/cmGlobVerificationManager.cxx
View File

@ -9,7 +9,6 @@
#include "cmListFileCache.h" #include "cmListFileCache.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmVersion.h" #include "cmVersion.h"
#include "cmake.h"
bool cmGlobVerificationManager::SaveVerificationScript(const std::string& path) bool cmGlobVerificationManager::SaveVerificationScript(const std::string& path)
{ {
@ -18,7 +17,7 @@ bool cmGlobVerificationManager::SaveVerificationScript(const std::string& path)
} }
std::string scriptFile = path; std::string scriptFile = path;
scriptFile += cmake::GetCMakeFilesDirectory(); scriptFile += "/CMakeFiles";
std::string stampFile = scriptFile; std::string stampFile = scriptFile;
cmSystemTools::MakeDirectory(scriptFile); cmSystemTools::MakeDirectory(scriptFile);
scriptFile += "/VerifyGlobs.cmake"; scriptFile += "/VerifyGlobs.cmake";

13
Source/cmGlobalGenerator.cxx
View File

@ -485,7 +485,7 @@ void cmGlobalGenerator::EnableLanguage(
mf->AddDefinition("RUN_CONFIGURE", true); mf->AddDefinition("RUN_CONFIGURE", true);
std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory(); std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
rootBin += cmake::GetCMakeFilesDirectory(); rootBin += "/CMakeFiles";
// If the configuration files path has been set, // If the configuration files path has been set,
// then we are in a try compile and need to copy the enable language // then we are in a try compile and need to copy the enable language
@ -1214,7 +1214,7 @@ void cmGlobalGenerator::Configure()
const char* logs[] = { "CMakeOutput.log", "CMakeError.log", nullptr }; const char* logs[] = { "CMakeOutput.log", "CMakeError.log", nullptr };
for (const char** log = logs; *log; ++log) { for (const char** log = logs; *log; ++log) {
std::string f = this->CMakeInstance->GetHomeOutputDirectory(); std::string f = this->CMakeInstance->GetHomeOutputDirectory();
f += cmake::GetCMakeFilesDirectory(); f += "/CMakeFiles";
f += "/"; f += "/";
f += *log; f += *log;
if (cmSystemTools::FileExists(f)) { if (cmSystemTools::FileExists(f)) {
@ -2000,7 +2000,7 @@ void cmGlobalGenerator::SetConfiguredFilesPath(cmGlobalGenerator* gen)
this->ConfiguredFilesPath = gen->ConfiguredFilesPath; this->ConfiguredFilesPath = gen->ConfiguredFilesPath;
} else { } else {
this->ConfiguredFilesPath = gen->CMakeInstance->GetHomeOutputDirectory(); this->ConfiguredFilesPath = gen->CMakeInstance->GetHomeOutputDirectory();
this->ConfiguredFilesPath += cmake::GetCMakeFilesDirectory(); this->ConfiguredFilesPath += "/CMakeFiles";
} }
} }
@ -2618,8 +2618,7 @@ std::string cmGlobalGenerator::GenerateRuleFile(
ruleFile += ".rule"; ruleFile += ".rule";
const char* dir = this->GetCMakeCFGIntDir(); const char* dir = this->GetCMakeCFGIntDir();
if (dir && dir[0] == '$') { if (dir && dir[0] == '$') {
cmSystemTools::ReplaceString(ruleFile, dir, cmSystemTools::ReplaceString(ruleFile, dir, "/CMakeFiles");
cmake::GetCMakeFilesDirectory());
} }
return ruleFile; return ruleFile;
} }
@ -2820,7 +2819,7 @@ void cmGlobalGenerator::CheckRuleHashes()
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)
std::string home = this->GetCMakeInstance()->GetHomeOutputDirectory(); std::string home = this->GetCMakeInstance()->GetHomeOutputDirectory();
std::string pfile = home; std::string pfile = home;
pfile += cmake::GetCMakeFilesDirectory(); pfile += "/CMakeFiles";
pfile += "/CMakeRuleHashes.txt"; pfile += "/CMakeRuleHashes.txt";
this->CheckRuleHashes(pfile, home); this->CheckRuleHashes(pfile, home);
this->WriteRuleHashes(pfile); this->WriteRuleHashes(pfile);
@ -2899,7 +2898,7 @@ void cmGlobalGenerator::WriteSummary()
{ {
// Record all target directories in a central location. // Record all target directories in a central location.
std::string fname = this->CMakeInstance->GetHomeOutputDirectory(); std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
fname += cmake::GetCMakeFilesDirectory(); fname += "/CMakeFiles";
fname += "/TargetDirectories.txt"; fname += "/TargetDirectories.txt";
cmGeneratedFileStream fout(fname); cmGeneratedFileStream fout(fname);

16
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -146,7 +146,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
for (cmLocalGenerator* lg : this->LocalGenerators) { for (cmLocalGenerator* lg : this->LocalGenerators) {
std::string markFileName = lg->GetCurrentBinaryDirectory(); std::string markFileName = lg->GetCurrentBinaryDirectory();
markFileName += "/"; markFileName += "/";
markFileName += cmake::GetCMakeFilesDirectory(); markFileName += "/CMakeFiles";
markFileName += "/progress.marks"; markFileName += "/progress.marks";
cmGeneratedFileStream markFile(markFileName); cmGeneratedFileStream markFile(markFileName);
markFile << this->CountProgressMarksInAll(lg) << "\n"; markFile << this->CountProgressMarksInAll(lg) << "\n";
@ -196,7 +196,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2()
// see if the build system must be regenerated. // see if the build system must be regenerated.
std::string makefileName = std::string makefileName =
this->GetCMakeInstance()->GetHomeOutputDirectory(); this->GetCMakeInstance()->GetHomeOutputDirectory();
makefileName += cmake::GetCMakeFilesDirectory(); makefileName += "/CMakeFiles";
makefileName += "/Makefile2"; makefileName += "/Makefile2";
cmGeneratedFileStream makefileStream(makefileName, false, cmGeneratedFileStream makefileStream(makefileName, false,
this->GetMakefileEncoding()); this->GetMakefileEncoding());
@ -268,7 +268,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
// see if the build system must be regenerated. // see if the build system must be regenerated.
std::string cmakefileName = std::string cmakefileName =
this->GetCMakeInstance()->GetHomeOutputDirectory(); this->GetCMakeInstance()->GetHomeOutputDirectory();
cmakefileName += cmake::GetCMakeFilesDirectory(); cmakefileName += "/CMakeFiles";
cmakefileName += "/Makefile.cmake"; cmakefileName += "/Makefile.cmake";
cmGeneratedFileStream cmakefileStream(cmakefileName); cmGeneratedFileStream cmakefileStream(cmakefileName);
if (!cmakefileStream) { if (!cmakefileStream) {
@ -332,7 +332,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
// Build the path to the cache check file. // Build the path to the cache check file.
std::string check = this->GetCMakeInstance()->GetHomeOutputDirectory(); std::string check = this->GetCMakeInstance()->GetHomeOutputDirectory();
check += cmake::GetCMakeFilesDirectory(); check += "/CMakeFiles";
check += "/cmake.check_cache"; check += "/cmake.check_cache";
// Set the corresponding makefile in the cmake file. // Set the corresponding makefile in the cmake file.
@ -363,7 +363,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
for (cmLocalGenerator* localGen : this->LocalGenerators) { for (cmLocalGenerator* localGen : this->LocalGenerators) {
lg = static_cast<cmLocalUnixMakefileGenerator3*>(localGen); lg = static_cast<cmLocalUnixMakefileGenerator3*>(localGen);
tmpStr = lg->GetCurrentBinaryDirectory(); tmpStr = lg->GetCurrentBinaryDirectory();
tmpStr += cmake::GetCMakeFilesDirectory(); tmpStr += "/CMakeFiles";
tmpStr += "/CMakeDirectoryInformation.cmake"; tmpStr += "/CMakeDirectoryInformation.cmake";
cmakefileStream << " \"" << lg->ConvertToRelativePath(binDir, tmpStr) cmakefileStream << " \"" << lg->ConvertToRelativePath(binDir, tmpStr)
<< "\"\n"; << "\"\n";
@ -572,7 +572,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules(
// Write the rule. // Write the rule.
commands.clear(); commands.clear();
std::string tmp = cmake::GetCMakeFilesDirectoryPostSlash(); std::string tmp = "CMakeFiles/";
tmp += "Makefile2"; tmp += "Makefile2";
commands.push_back(lg->GetRecursiveMakeCall(tmp.c_str(), name)); commands.push_back(lg->GetRecursiveMakeCall(tmp.c_str(), name));
depends.clear(); depends.clear();
@ -672,7 +672,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2(
cmLocalUnixMakefileGenerator3::EchoProgress progress; cmLocalUnixMakefileGenerator3::EchoProgress progress;
progress.Dir = lg->GetBinaryDirectory(); progress.Dir = lg->GetBinaryDirectory();
progress.Dir += cmake::GetCMakeFilesDirectory(); progress.Dir += "/CMakeFiles";
{ {
std::ostringstream progressArg; std::ostringstream progressArg;
const char* sep = ""; const char* sep = "";
@ -726,7 +726,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2(
progCmd << " " << this->CountProgressMarksInTarget(gtarget, emitted); progCmd << " " << this->CountProgressMarksInTarget(gtarget, emitted);
commands.push_back(progCmd.str()); commands.push_back(progCmd.str());
} }
std::string tmp = cmake::GetCMakeFilesDirectoryPostSlash(); std::string tmp = "CMakeFiles/";
tmp += "Makefile2"; tmp += "Makefile2";
commands.push_back(lg->GetRecursiveMakeCall(tmp.c_str(), localName)); commands.push_back(lg->GetRecursiveMakeCall(tmp.c_str(), localName));
{ {

4
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -687,7 +687,7 @@ bool cmGlobalVisualStudio10Generator::FindVCTargetsPath(cmMakefile* mf)
wd = this->ConfiguredFilesPath; wd = this->ConfiguredFilesPath;
} else { } else {
wd = this->GetCMakeInstance()->GetHomeOutputDirectory(); wd = this->GetCMakeInstance()->GetHomeOutputDirectory();
wd += cmake::GetCMakeFilesDirectory(); wd += "/CMakeFiles";
} }
wd += "/"; wd += "/";
wd += cmVersion::GetCMakeVersion(); wd += cmVersion::GetCMakeVersion();
@ -986,7 +986,7 @@ std::string cmGlobalVisualStudio10Generator::GenerateRuleFile(
// The VS 10 generator needs to create the .rule files on disk. // The VS 10 generator needs to create the .rule files on disk.
// Hide them away under the CMakeFiles directory. // Hide them away under the CMakeFiles directory.
std::string ruleDir = this->GetCMakeInstance()->GetHomeOutputDirectory(); std::string ruleDir = this->GetCMakeInstance()->GetHomeOutputDirectory();
ruleDir += cmake::GetCMakeFilesDirectory(); ruleDir += "/CMakeFiles";
ruleDir += "/"; ruleDir += "/";
ruleDir += cmSystemTools::ComputeStringMD5( ruleDir += cmSystemTools::ComputeStringMD5(
cmSystemTools::GetFilenamePath(output).c_str()); cmSystemTools::GetFilenamePath(output).c_str());

4
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -117,7 +117,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
// Create a list of all stamp files for this project. // Create a list of all stamp files for this project.
std::vector<std::string> stamps; std::vector<std::string> stamps;
std::string stampList = cmake::GetCMakeFilesDirectoryPostSlash(); std::string stampList = "CMakeFiles/";
stampList += cmGlobalVisualStudio8Generator::GetGenerateStampList(); stampList += cmGlobalVisualStudio8Generator::GetGenerateStampList();
{ {
std::string stampListFile = std::string stampListFile =
@ -129,7 +129,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
for (cmLocalGenerator const* gi : generators) { for (cmLocalGenerator const* gi : generators) {
stampFile = gi->GetMakefile()->GetCurrentBinaryDirectory(); stampFile = gi->GetMakefile()->GetCurrentBinaryDirectory();
stampFile += "/"; stampFile += "/";
stampFile += cmake::GetCMakeFilesDirectoryPostSlash(); stampFile += "CMakeFiles/";
stampFile += "generate.stamp"; stampFile += "generate.stamp";
fout << stampFile << "\n"; fout << stampFile << "\n";
stamps.push_back(stampFile); stamps.push_back(stampFile);

6
Source/cmGlobalXCodeGenerator.cxx
View File

@ -607,7 +607,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
std::string checkCache = root->GetBinaryDirectory(); std::string checkCache = root->GetBinaryDirectory();
checkCache += "/"; checkCache += "/";
checkCache += cmake::GetCMakeFilesDirectoryPostSlash(); checkCache += "CMakeFiles/";
checkCache += "cmake.check_cache"; checkCache += "cmake.check_cache";
if (cm->DoWriteGlobVerifyTarget()) { if (cm->DoWriteGlobVerifyTarget()) {
@ -1397,7 +1397,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
// language. // language.
cmMakefile* mf = gtgt->Target->GetMakefile(); cmMakefile* mf = gtgt->Target->GetMakefile();
std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory(); std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
fname += cmake::GetCMakeFilesDirectory(); fname += "/CMakeFiles";
fname += "/"; fname += "/";
fname += gtgt->GetName(); fname += gtgt->GetName();
fname += "-CMakeForceLinker"; fname += "-CMakeForceLinker";
@ -3705,7 +3705,7 @@ std::string cmGlobalXCodeGenerator::ComputeInfoPListLocation(
cmGeneratorTarget* target) cmGeneratorTarget* target)
{ {
std::string plist = target->GetLocalGenerator()->GetCurrentBinaryDirectory(); std::string plist = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
plist += cmake::GetCMakeFilesDirectory(); plist += "/CMakeFiles";
plist += "/"; plist += "/";
plist += target->GetName(); plist += target->GetName();
plist += ".dir/Info.plist"; plist += ".dir/Info.plist";

3
Source/cmInstallExportGenerator.cxx
View File

@ -15,7 +15,6 @@
#include "cmInstallType.h" #include "cmInstallType.h"
#include "cmLocalGenerator.h" #include "cmLocalGenerator.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmake.h"
cmInstallExportGenerator::cmInstallExportGenerator( cmInstallExportGenerator::cmInstallExportGenerator(
cmExportSet* exportSet, const char* destination, cmExportSet* exportSet, const char* destination,
@ -57,7 +56,7 @@ void cmInstallExportGenerator::ComputeTempDir()
// Choose a temporary directory in which to generate the import // Choose a temporary directory in which to generate the import
// files to be installed. // files to be installed.
this->TempDir = this->LocalGenerator->GetCurrentBinaryDirectory(); this->TempDir = this->LocalGenerator->GetCurrentBinaryDirectory();
this->TempDir += cmake::GetCMakeFilesDirectory(); this->TempDir += "/CMakeFiles";
this->TempDir += "/Export"; this->TempDir += "/Export";
if (this->Destination.empty()) { if (this->Destination.empty()) {
return; return;

3
Source/cmInstallTargetGenerator.cxx
View File

@ -19,7 +19,6 @@
#include "cmStateTypes.h" #include "cmStateTypes.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmTarget.h" #include "cmTarget.h"
#include "cmake.h"
cmInstallTargetGenerator::cmInstallTargetGenerator( cmInstallTargetGenerator::cmInstallTargetGenerator(
const std::string& targetName, const char* dest, bool implib, const std::string& targetName, const char* dest, bool implib,
@ -102,7 +101,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(
if (this->Target->NeedRelinkBeforeInstall(config)) { if (this->Target->NeedRelinkBeforeInstall(config)) {
fromDirConfig = fromDirConfig =
this->Target->GetLocalGenerator()->GetCurrentBinaryDirectory(); this->Target->GetLocalGenerator()->GetCurrentBinaryDirectory();
fromDirConfig += cmake::GetCMakeFilesDirectory(); fromDirConfig += "/CMakeFiles";
fromDirConfig += "/CMakeRelink.dir/"; fromDirConfig += "/CMakeRelink.dir/";
} else { } else {
cmStateEnums::ArtifactType artifact = this->ImportLibrary cmStateEnums::ArtifactType artifact = this->ImportLibrary

4
Source/cmLocalNinjaGenerator.cxx
View File

@ -106,7 +106,7 @@ void cmLocalNinjaGenerator::Generate()
std::string cmLocalNinjaGenerator::GetTargetDirectory( std::string cmLocalNinjaGenerator::GetTargetDirectory(
cmGeneratorTarget const* target) const cmGeneratorTarget const* target) const
{ {
std::string dir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string dir = "CMakeFiles/";
dir += target->GetName(); dir += target->GetName();
#if defined(__VMS) #if defined(__VMS)
dir += "_dir"; dir += "_dir";
@ -305,7 +305,7 @@ std::string cmLocalNinjaGenerator::WriteCommandScript(
scriptPath = target->GetSupportDirectory(); scriptPath = target->GetSupportDirectory();
} else { } else {
scriptPath = this->GetCurrentBinaryDirectory(); scriptPath = this->GetCurrentBinaryDirectory();
scriptPath += cmake::GetCMakeFilesDirectory(); scriptPath += "/CMakeFiles";
} }
cmSystemTools::MakeDirectory(scriptPath); cmSystemTools::MakeDirectory(scriptPath);
scriptPath += '/'; scriptPath += '/';

20
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -371,7 +371,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefileTargets(
depends.clear(); depends.clear();
// Build the target for this pass. // Build the target for this pass.
std::string makefile2 = cmake::GetCMakeFilesDirectoryPostSlash(); std::string makefile2 = "CMakeFiles/";
makefile2 += "Makefile2"; makefile2 += "Makefile2";
commands.push_back( commands.push_back(
this->GetRecursiveMakeCall(makefile2.c_str(), localName)); this->GetRecursiveMakeCall(makefile2.c_str(), localName));
@ -429,7 +429,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefileTargets(
void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile() void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile()
{ {
std::string infoFileName = this->GetCurrentBinaryDirectory(); std::string infoFileName = this->GetCurrentBinaryDirectory();
infoFileName += cmake::GetCMakeFilesDirectory(); infoFileName += "/CMakeFiles";
infoFileName += "/CMakeDirectoryInformation.cmake"; infoFileName += "/CMakeDirectoryInformation.cmake";
// Open the output file. // Open the output file.
@ -771,7 +771,7 @@ void cmLocalUnixMakefileGenerator3::WriteSpecialTargetsBottom(
cmOutputConverter::SHELL); cmOutputConverter::SHELL);
commands.push_back(rescanRule); commands.push_back(rescanRule);
} }
std::string cmakefileName = cmake::GetCMakeFilesDirectoryPostSlash(); std::string cmakefileName = "CMakeFiles/";
cmakefileName += "Makefile.cmake"; cmakefileName += "Makefile.cmake";
std::string runRule = std::string runRule =
"$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)"; "$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)";
@ -1296,7 +1296,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
// may have changed. In this case discard all old dependencies. // may have changed. In this case discard all old dependencies.
bool needRescanDirInfo = false; bool needRescanDirInfo = false;
std::string dirInfoFile = this->GetCurrentBinaryDirectory(); std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += cmake::GetCMakeFilesDirectory(); dirInfoFile += "/CMakeFiles";
dirInfoFile += "/CMakeDirectoryInformation.cmake"; dirInfoFile += "/CMakeDirectoryInformation.cmake";
{ {
int result; int result;
@ -1362,7 +1362,7 @@ bool cmLocalUnixMakefileGenerator3::ScanDependencies(
cmMakefile* mf = this->Makefile; cmMakefile* mf = this->Makefile;
bool haveDirectoryInfo = false; bool haveDirectoryInfo = false;
std::string dirInfoFile = this->GetCurrentBinaryDirectory(); std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += cmake::GetCMakeFilesDirectory(); dirInfoFile += "/CMakeFiles";
dirInfoFile += "/CMakeDirectoryInformation.cmake"; dirInfoFile += "/CMakeDirectoryInformation.cmake";
if (mf->ReadListFile(dirInfoFile.c_str()) && if (mf->ReadListFile(dirInfoFile.c_str()) &&
!cmSystemTools::GetErrorOccuredFlag()) { !cmSystemTools::GetErrorOccuredFlag()) {
@ -1597,14 +1597,14 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
} }
std::string progressDir = this->GetBinaryDirectory(); std::string progressDir = this->GetBinaryDirectory();
progressDir += cmake::GetCMakeFilesDirectory(); progressDir += "/CMakeFiles";
{ {
std::ostringstream progCmd; std::ostringstream progCmd;
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
progCmd << this->ConvertToOutputFormat( progCmd << this->ConvertToOutputFormat(
cmSystemTools::CollapseFullPath(progressDir), cmOutputConverter::SHELL); cmSystemTools::CollapseFullPath(progressDir), cmOutputConverter::SHELL);
std::string progressFile = cmake::GetCMakeFilesDirectory(); std::string progressFile = "/CMakeFiles";
progressFile += "/progress.marks"; progressFile += "/progress.marks";
std::string progressFileNameFull = this->ConvertToFullPath(progressFile); std::string progressFileNameFull = this->ConvertToFullPath(progressFile);
progCmd << " " progCmd << " "
@ -1613,7 +1613,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
cmOutputConverter::SHELL); cmOutputConverter::SHELL);
commands.push_back(progCmd.str()); commands.push_back(progCmd.str());
} }
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string mf2Dir = "CMakeFiles/";
mf2Dir += "Makefile2"; mf2Dir += "Makefile2";
commands.push_back( commands.push_back(
this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget)); this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
@ -1682,7 +1682,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
cmOutputConverter::SHELL); cmOutputConverter::SHELL);
commands.push_back(rescanRule); commands.push_back(rescanRule);
} }
std::string cmakefileName = cmake::GetCMakeFilesDirectoryPostSlash(); std::string cmakefileName = "CMakeFiles/";
cmakefileName += "Makefile.cmake"; cmakefileName += "Makefile.cmake";
{ {
std::string runRule = std::string runRule =
@ -2027,7 +2027,7 @@ std::string cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(
std::string cmLocalUnixMakefileGenerator3::GetTargetDirectory( std::string cmLocalUnixMakefileGenerator3::GetTargetDirectory(
cmGeneratorTarget const* target) const cmGeneratorTarget const* target) const
{ {
std::string dir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string dir = "CMakeFiles/";
dir += target->GetName(); dir += target->GetName();
#if defined(__VMS) #if defined(__VMS)
dir += "_dir"; dir += "_dir";

6
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -97,7 +97,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
force_commands.push_back(force_command); force_commands.push_back(force_command);
std::string no_main_dependency; std::string no_main_dependency;
std::string force = this->GetCurrentBinaryDirectory(); std::string force = this->GetCurrentBinaryDirectory();
force += cmake::GetCMakeFilesDirectory(); force += "/CMakeFiles";
force += "/"; force += "/";
force += l->GetName(); force += l->GetName();
force += "_force"; force += "_force";
@ -144,7 +144,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
// Touch a timestamp file used to determine when the project file is // Touch a timestamp file used to determine when the project file is
// out of date. // out of date.
std::string stampName = this->GetCurrentBinaryDirectory(); std::string stampName = this->GetCurrentBinaryDirectory();
stampName += cmake::GetCMakeFilesDirectory(); stampName += "/CMakeFiles";
cmSystemTools::MakeDirectory(stampName.c_str()); cmSystemTools::MakeDirectory(stampName.c_str());
stampName += "/"; stampName += "/";
stampName += "generate.stamp"; stampName += "generate.stamp";
@ -254,7 +254,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
std::string stampName = this->GetCurrentBinaryDirectory(); std::string stampName = this->GetCurrentBinaryDirectory();
stampName += "/"; stampName += "/";
stampName += cmake::GetCMakeFilesDirectoryPostSlash(); stampName += "CMakeFiles/";
stampName += "generate.stamp"; stampName += "generate.stamp";
cmCustomCommandLine commandLine; cmCustomCommandLine commandLine;
commandLine.push_back(cmSystemTools::GetCMakeCommand()); commandLine.push_back(cmSystemTools::GetCMakeCommand());

7
Source/cmMakefile.cxx
View File

@ -1138,7 +1138,7 @@ cmTarget* cmMakefile::AddUtilityCommand(
// Store the custom command in the target. // Store the custom command in the target.
if (!commandLines.empty() || !depends.empty()) { if (!commandLines.empty() || !depends.empty()) {
std::string force = this->GetCurrentBinaryDirectory(); std::string force = this->GetCurrentBinaryDirectory();
force += cmake::GetCMakeFilesDirectory(); force += "/CMakeFiles";
force += "/"; force += "/";
force += utilityName; force += utilityName;
std::vector<std::string> forced; std::vector<std::string> forced;
@ -1492,7 +1492,7 @@ void cmMakefile::Configure()
// make sure the CMakeFiles dir is there // make sure the CMakeFiles dir is there
std::string filesDir = this->StateSnapshot.GetDirectory().GetCurrentBinary(); std::string filesDir = this->StateSnapshot.GetDirectory().GetCurrentBinary();
filesDir += cmake::GetCMakeFilesDirectory(); filesDir += "/CMakeFiles";
cmSystemTools::MakeDirectory(filesDir); cmSystemTools::MakeDirectory(filesDir);
assert(cmSystemTools::FileExists(currentStart, true)); assert(cmSystemTools::FileExists(currentStart, true));
@ -2720,8 +2720,7 @@ bool cmMakefile::IsProjectFile(const char* filename) const
{ {
return cmSystemTools::IsSubDirectory(filename, this->GetHomeDirectory()) || return cmSystemTools::IsSubDirectory(filename, this->GetHomeDirectory()) ||
(cmSystemTools::IsSubDirectory(filename, this->GetHomeOutputDirectory()) && (cmSystemTools::IsSubDirectory(filename, this->GetHomeOutputDirectory()) &&
!cmSystemTools::IsSubDirectory(filename, !cmSystemTools::IsSubDirectory(filename, "/CMakeFiles"));
cmake::GetCMakeFilesDirectory()));
} }
MessageType cmMakefile::ExpandVariablesInStringNew( MessageType cmMakefile::ExpandVariablesInStringNew(

3
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -25,7 +25,6 @@
#include "cmStateSnapshot.h" #include "cmStateSnapshot.h"
#include "cmStateTypes.h" #include "cmStateTypes.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmake.h"
cmMakefileExecutableTargetGenerator::cmMakefileExecutableTargetGenerator( cmMakefileExecutableTargetGenerator::cmMakefileExecutableTargetGenerator(
cmGeneratorTarget* target) cmGeneratorTarget* target)
@ -317,7 +316,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
std::string outpathImp; std::string outpathImp;
if (relink) { if (relink) {
outpath = this->Makefile->GetCurrentBinaryDirectory(); outpath = this->Makefile->GetCurrentBinaryDirectory();
outpath += cmake::GetCMakeFilesDirectory(); outpath += "/CMakeFiles";
outpath += "/CMakeRelink.dir"; outpath += "/CMakeRelink.dir";
cmSystemTools::MakeDirectory(outpath); cmSystemTools::MakeDirectory(outpath);
outpath += "/"; outpath += "/";

3
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -25,7 +25,6 @@
#include "cmStateSnapshot.h" #include "cmStateSnapshot.h"
#include "cmStateTypes.h" #include "cmStateTypes.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmake.h"
cmMakefileLibraryTargetGenerator::cmMakefileLibraryTargetGenerator( cmMakefileLibraryTargetGenerator::cmMakefileLibraryTargetGenerator(
cmGeneratorTarget* target) cmGeneratorTarget* target)
@ -499,7 +498,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
outpath += "/"; outpath += "/";
} else if (relink) { } else if (relink) {
outpath = this->Makefile->GetCurrentBinaryDirectory(); outpath = this->Makefile->GetCurrentBinaryDirectory();
outpath += cmake::GetCMakeFilesDirectory(); outpath += "/CMakeFiles";
outpath += "/CMakeRelink.dir"; outpath += "/CMakeRelink.dir";
cmSystemTools::MakeDirectory(outpath); cmSystemTools::MakeDirectory(outpath);
outpath += "/"; outpath += "/";

2
Source/cmMakefileTargetGenerator.cxx
View File

@ -1222,7 +1222,7 @@ void cmMakefileTargetGenerator::MakeEchoProgress(
cmLocalUnixMakefileGenerator3::EchoProgress& progress) const cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
{ {
progress.Dir = this->LocalGenerator->GetBinaryDirectory(); progress.Dir = this->LocalGenerator->GetBinaryDirectory();
progress.Dir += cmake::GetCMakeFilesDirectory(); progress.Dir += "/CMakeFiles";
std::ostringstream progressArg; std::ostringstream progressArg;
progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")"; progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
progress.Arg = progressArg.str(); progress.Arg = progressArg.str();

7
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -31,7 +31,6 @@
#include "cmStateSnapshot.h" #include "cmStateSnapshot.h"
#include "cmStateTypes.h" #include "cmStateTypes.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmake.h"
class cmCustomCommand; class cmCustomCommand;
@ -718,8 +717,7 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule()); globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule());
const std::string rspfile = this->ConvertToNinjaPath( const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + std::string("CMakeFiles/") + genTarget.GetName() + ".rsp");
genTarget.GetName() + ".rsp");
// Gather order-only dependencies. // Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps; cmNinjaDeps orderOnlyDeps;
@ -1004,8 +1002,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
} }
const std::string rspfile = this->ConvertToNinjaPath( const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + gt.GetName() + std::string("CMakeFiles/") + gt.GetName() + ".rsp");
".rsp");
// Gather order-only dependencies. // Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps; cmNinjaDeps orderOnlyDeps;

3
Source/cmNinjaUtilityTargetGenerator.cxx
View File

@ -14,7 +14,6 @@
#include "cmSourceFile.h" #include "cmSourceFile.h"
#include "cmStateTypes.h" #include "cmStateTypes.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmake.h"
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
@ -35,7 +34,7 @@ void cmNinjaUtilityTargetGenerator::Generate()
{ {
std::string utilCommandName = std::string utilCommandName =
this->GetLocalGenerator()->GetCurrentBinaryDirectory(); this->GetLocalGenerator()->GetCurrentBinaryDirectory();
utilCommandName += cmake::GetCMakeFilesDirectory(); utilCommandName += "/CMakeFiles";
utilCommandName += "/"; utilCommandName += "/";
utilCommandName += this->GetTargetName() + ".util"; utilCommandName += this->GetTargetName() + ".util";
utilCommandName = this->ConvertToNinjaPath(utilCommandName); utilCommandName = this->ConvertToNinjaPath(utilCommandName);

3
Source/cmQtAutoGenInitializer.cxx
View File

@ -26,7 +26,6 @@
#include "cmStateTypes.h" #include "cmStateTypes.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmTarget.h" #include "cmTarget.h"
#include "cmake.h"
#include "cmsys/FStream.hxx" #include "cmsys/FStream.hxx"
#include "cmsys/SystemInformation.hxx" #include "cmsys/SystemInformation.hxx"
@ -352,7 +351,7 @@ bool cmQtAutoGenInitializer::InitCustomTargets()
// Info directory // Info directory
this->Dir.Info = cbd; this->Dir.Info = cbd;
this->Dir.Info += cmake::GetCMakeFilesDirectory(); this->Dir.Info += "/CMakeFiles";
this->Dir.Info += '/'; this->Dir.Info += '/';
this->Dir.Info += this->Target->GetName(); this->Dir.Info += this->Target->GetName();
this->Dir.Info += "_autogen"; this->Dir.Info += "_autogen";

4
Source/cmStateSnapshot.cxx
View File

@ -16,7 +16,6 @@
#include "cmStateDirectory.h" #include "cmStateDirectory.h"
#include "cmStatePrivate.h" #include "cmStatePrivate.h"
#include "cmVersion.h" #include "cmVersion.h"
#include "cmake.h"
#if !defined(_WIN32) #if !defined(_WIN32)
# include <sys/utsname.h> # include <sys/utsname.h>
@ -348,8 +347,7 @@ void cmStateSnapshot::SetDefaultDefinitions()
std::to_string(cmVersion::GetTweakVersion())); std::to_string(cmVersion::GetTweakVersion()));
this->SetDefinition("CMAKE_VERSION", cmVersion::GetCMakeVersion()); this->SetDefinition("CMAKE_VERSION", cmVersion::GetCMakeVersion());
this->SetDefinition("CMAKE_FILES_DIRECTORY", this->SetDefinition("CMAKE_FILES_DIRECTORY", "/CMakeFiles");
cmake::GetCMakeFilesDirectory());
// Setup the default include file regular expression (match everything). // Setup the default include file regular expression (match everything).
this->Position->BuildSystemDirectory->Properties.SetProperty( this->Position->BuildSystemDirectory->Properties.SetProperty(

2
Source/cmTryRunCommand.cxx
View File

@ -217,7 +217,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
// removed at the end of TRY_RUN and the user can run it manually // removed at the end of TRY_RUN and the user can run it manually
// on the target platform. // on the target platform.
std::string copyDest = this->Makefile->GetHomeOutputDirectory(); std::string copyDest = this->Makefile->GetHomeOutputDirectory();
copyDest += cmake::GetCMakeFilesDirectory(); copyDest += "/CMakeFiles";
copyDest += "/"; copyDest += "/";
copyDest += cmSystemTools::GetFilenameWithoutExtension(this->OutputFile); copyDest += cmSystemTools::GetFilenameWithoutExtension(this->OutputFile);
copyDest += "-"; copyDest += "-";

7
Source/cmake.cxx
View File

@ -2560,8 +2560,7 @@ int cmake::Build(int jobs, const std::string& dir, const std::string& target,
// actually starting the build. If not done separately from the build // actually starting the build. If not done separately from the build
// itself, there is the risk of building an out-of-date solution file due // itself, there is the risk of building an out-of-date solution file due
// to limitations of the underlying build system. // to limitations of the underlying build system.
std::string const stampList = cachePath + "/" + std::string const stampList = cachePath + "/" + "CMakeFiles/" +
GetCMakeFilesDirectoryPostSlash() +
cmGlobalVisualStudio9Generator::GetGenerateStampList(); cmGlobalVisualStudio9Generator::GetGenerateStampList();
// Note that the stampList file only exists for VS generators. // Note that the stampList file only exists for VS generators.
@ -2571,8 +2570,8 @@ int cmake::Build(int jobs, const std::string& dir, const std::string& target,
// the glob verification script before starting the build // the glob verification script before starting the build
this->AddScriptingCommands(); this->AddScriptingCommands();
if (this->GlobalGenerator->MatchesGeneratorName("Visual Studio 9 2008")) { if (this->GlobalGenerator->MatchesGeneratorName("Visual Studio 9 2008")) {
std::string const globVerifyScript = cachePath + "/" + std::string const globVerifyScript =
GetCMakeFilesDirectoryPostSlash() + "VerifyGlobs.cmake"; cachePath + "/" + "CMakeFiles/" + "VerifyGlobs.cmake";
if (cmSystemTools::FileExists(globVerifyScript)) { if (cmSystemTools::FileExists(globVerifyScript)) {
std::vector<std::string> args; std::vector<std::string> args;
this->ReadListFile(args, globVerifyScript.c_str()); this->ReadListFile(args, globVerifyScript.c_str());

6
Source/cmake.h
View File

@ -123,12 +123,6 @@ public:
#endif #endif
std::string ReportCapabilities(bool haveServerMode) const; std::string ReportCapabilities(bool haveServerMode) const;
static const char* GetCMakeFilesDirectory() { return "/CMakeFiles"; }
static const char* GetCMakeFilesDirectoryPostSlash()
{
return "CMakeFiles/";
}
//@{ //@{
/** /**
* Set/Get the home directory (or output directory) in the project. The * Set/Get the home directory (or output directory) in the project. The