Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
3e867ed4
Commit
3e867ed4
authored
Nov 22, 2018
by
bmanga
Browse files
cmake: inlined files dir constant and removed it from cmake.h
parent
c144db1b
Changes
28
Hide whitespace changes
Inline
Side-by-side
Source/CTest/cmCTestCoverageHandler.cxx
View file @
3e867ed4
...
...
@@ -15,7 +15,6 @@
#include
"cmSystemTools.h"
#include
"cmWorkingDirectory.h"
#include
"cmXMLWriter.h"
#include
"cmake.h"
#include
"cmsys/FStream.hxx"
#include
"cmsys/Glob.hxx"
...
...
@@ -2227,7 +2226,7 @@ int cmCTestCoverageHandler::GetLabelId(std::string const& label)
void
cmCTestCoverageHandler
::
LoadLabels
()
{
std
::
string
fileList
=
this
->
CTest
->
GetBinaryDir
();
fileList
+=
cmake
::
GetCMakeFilesDirectory
()
;
fileList
+=
"/CMakeFiles"
;
fileList
+=
"/TargetDirectories.txt"
;
cmCTestOptionalLog
(
this
->
CTest
,
HANDLER_VERBOSE_OUTPUT
,
" target directory list ["
<<
fileList
<<
"]
\n
"
,
...
...
Source/CTest/cmCTestLaunch.cxx
View file @
3e867ed4
...
...
@@ -282,7 +282,7 @@ void cmCTestLaunch::LoadLabels()
// Labels are listed in per-target files.
std
::
string
fname
=
this
->
OptionBuildDir
;
fname
+=
cmake
::
GetCMakeFilesDirectory
()
;
fname
+=
"/CMakeFiles"
;
fname
+=
"/"
;
fname
+=
this
->
OptionTargetName
;
fname
+=
".dir/Labels.txt"
;
...
...
Source/cmCacheManager.cxx
View file @
3e867ed4
...
...
@@ -16,7 +16,6 @@
#include
"cmState.h"
#include
"cmSystemTools.h"
#include
"cmVersion.h"
#include
"cmake.h"
cmCacheManager
::
cmCacheManager
()
{
...
...
@@ -27,7 +26,7 @@ cmCacheManager::cmCacheManager()
void
cmCacheManager
::
CleanCMakeFiles
(
const
std
::
string
&
path
)
{
std
::
string
glob
=
path
;
glob
+=
cmake
::
GetCMakeFilesDirectory
()
;
glob
+=
"/CMakeFiles"
;
glob
+=
"/*.cmake"
;
cmsys
::
Glob
globIt
;
globIt
.
FindFiles
(
glob
);
...
...
@@ -360,7 +359,7 @@ bool cmCacheManager::SaveCache(const std::string& path, cmMessenger* messenger)
fout
<<
"
\n
"
;
fout
.
Close
();
std
::
string
checkCacheFile
=
path
;
checkCacheFile
+=
cmake
::
GetCMakeFilesDirectory
()
;
checkCacheFile
+=
"/CMakeFiles"
;
cmSystemTools
::
MakeDirectory
(
checkCacheFile
);
checkCacheFile
+=
"/cmake.check_cache"
;
cmsys
::
ofstream
checkCache
(
checkCacheFile
.
c_str
());
...
...
@@ -384,7 +383,7 @@ bool cmCacheManager::DeleteCache(const std::string& path)
cmSystemTools
::
RemoveFile
(
cacheFile
);
// now remove the files in the CMakeFiles directory
// this cleans up language cache files
cmakeFiles
+=
cmake
::
GetCMakeFilesDirectory
()
;
cmakeFiles
+=
"/CMakeFiles"
;
if
(
cmSystemTools
::
FileIsDirectory
(
cmakeFiles
))
{
cmSystemTools
::
RemoveADirectory
(
cmakeFiles
);
}
...
...
Source/cmCoreTryCompile.cxx
View file @
3e867ed4
...
...
@@ -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
// signature
if
(
this
->
SrcFileSignature
)
{
this
->
BinaryDirectory
+=
cmake
::
GetCMakeFilesDirectory
()
;
this
->
BinaryDirectory
+=
"/CMakeFiles"
;
this
->
BinaryDirectory
+=
"/CMakeTmp"
;
}
else
{
// only valid for srcfile signatures
...
...
Source/cmFileCommand.cxx
View file @
3e867ed4
...
...
@@ -558,7 +558,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
if
(
hex_conversion_enabled
)
{
// TODO: should work without temp file, but just on a memory buffer
std
::
string
binaryFileName
=
this
->
Makefile
->
GetCurrentBinaryDirectory
();
binaryFileName
+=
cmake
::
GetCMakeFilesDirectory
()
;
binaryFileName
+=
"/CMakeFiles"
;
binaryFileName
+=
"/FileCommandStringsBinaryFile"
;
if
(
cmHexFileConverter
::
TryConvert
(
fileName
.
c_str
(),
binaryFileName
.
c_str
()))
{
...
...
Source/cmGeneratorTarget.cxx
View file @
3e867ed4
...
...
@@ -6140,7 +6140,7 @@ bool cmGeneratorTarget::HasImportLibrary(std::string const& config) const
std
::
string
cmGeneratorTarget
::
GetSupportDirectory
()
const
{
std
::
string
dir
=
this
->
LocalGenerator
->
GetCurrentBinaryDirectory
();
dir
+=
cmake
::
GetCMakeFilesDirectory
()
;
dir
+=
"/CMakeFiles"
;
dir
+=
"/"
;
dir
+=
this
->
GetName
();
#if defined(__VMS)
...
...
Source/cmGlobVerificationManager.cxx
View file @
3e867ed4
...
...
@@ -9,7 +9,6 @@
#include
"cmListFileCache.h"
#include
"cmSystemTools.h"
#include
"cmVersion.h"
#include
"cmake.h"
bool
cmGlobVerificationManager
::
SaveVerificationScript
(
const
std
::
string
&
path
)
{
...
...
@@ -18,7 +17,7 @@ bool cmGlobVerificationManager::SaveVerificationScript(const std::string& path)
}
std
::
string
scriptFile
=
path
;
scriptFile
+=
cmake
::
GetCMakeFilesDirectory
()
;
scriptFile
+=
"/CMakeFiles"
;
std
::
string
stampFile
=
scriptFile
;
cmSystemTools
::
MakeDirectory
(
scriptFile
);
scriptFile
+=
"/VerifyGlobs.cmake"
;
...
...
Source/cmGlobalGenerator.cxx
View file @
3e867ed4
...
...
@@ -485,7 +485,7 @@ void cmGlobalGenerator::EnableLanguage(
mf
->
AddDefinition
(
"RUN_CONFIGURE"
,
true
);
std
::
string
rootBin
=
this
->
CMakeInstance
->
GetHomeOutputDirectory
();
rootBin
+=
cmake
::
GetCMakeFilesDirectory
()
;
rootBin
+=
"/CMakeFiles"
;
// If the configuration files path has been set,
// 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
};
for
(
const
char
**
log
=
logs
;
*
log
;
++
log
)
{
std
::
string
f
=
this
->
CMakeInstance
->
GetHomeOutputDirectory
();
f
+=
cmake
::
GetCMakeFilesDirectory
()
;
f
+=
"/CMakeFiles"
;
f
+=
"/"
;
f
+=
*
log
;
if
(
cmSystemTools
::
FileExists
(
f
))
{
...
...
@@ -2000,7 +2000,7 @@ void cmGlobalGenerator::SetConfiguredFilesPath(cmGlobalGenerator* gen)
this
->
ConfiguredFilesPath
=
gen
->
ConfiguredFilesPath
;
}
else
{
this
->
ConfiguredFilesPath
=
gen
->
CMakeInstance
->
GetHomeOutputDirectory
();
this
->
ConfiguredFilesPath
+=
cmake
::
GetCMakeFilesDirectory
()
;
this
->
ConfiguredFilesPath
+=
"/CMakeFiles"
;
}
}
...
...
@@ -2618,8 +2618,7 @@ std::string cmGlobalGenerator::GenerateRuleFile(
ruleFile
+=
".rule"
;
const
char
*
dir
=
this
->
GetCMakeCFGIntDir
();
if
(
dir
&&
dir
[
0
]
==
'$'
)
{
cmSystemTools
::
ReplaceString
(
ruleFile
,
dir
,
cmake
::
GetCMakeFilesDirectory
());
cmSystemTools
::
ReplaceString
(
ruleFile
,
dir
,
"/CMakeFiles"
);
}
return
ruleFile
;
}
...
...
@@ -2820,7 +2819,7 @@ void cmGlobalGenerator::CheckRuleHashes()
#if defined(CMAKE_BUILD_WITH_CMAKE)
std
::
string
home
=
this
->
GetCMakeInstance
()
->
GetHomeOutputDirectory
();
std
::
string
pfile
=
home
;
pfile
+=
cmake
::
GetCMakeFilesDirectory
()
;
pfile
+=
"/CMakeFiles"
;
pfile
+=
"/CMakeRuleHashes.txt"
;
this
->
CheckRuleHashes
(
pfile
,
home
);
this
->
WriteRuleHashes
(
pfile
);
...
...
@@ -2899,7 +2898,7 @@ void cmGlobalGenerator::WriteSummary()
{
// Record all target directories in a central location.
std
::
string
fname
=
this
->
CMakeInstance
->
GetHomeOutputDirectory
();
fname
+=
cmake
::
GetCMakeFilesDirectory
()
;
fname
+=
"/CMakeFiles"
;
fname
+=
"/TargetDirectories.txt"
;
cmGeneratedFileStream
fout
(
fname
);
...
...
Source/cmGlobalUnixMakefileGenerator3.cxx
View file @
3e867ed4
...
...
@@ -146,7 +146,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
for
(
cmLocalGenerator
*
lg
:
this
->
LocalGenerators
)
{
std
::
string
markFileName
=
lg
->
GetCurrentBinaryDirectory
();
markFileName
+=
"/"
;
markFileName
+=
cmake
::
GetCMakeFilesDirectory
()
;
markFileName
+=
"/CMakeFiles"
;
markFileName
+=
"/progress.marks"
;
cmGeneratedFileStream
markFile
(
markFileName
);
markFile
<<
this
->
CountProgressMarksInAll
(
lg
)
<<
"
\n
"
;
...
...
@@ -196,7 +196,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2()
// see if the build system must be regenerated.
std
::
string
makefileName
=
this
->
GetCMakeInstance
()
->
GetHomeOutputDirectory
();
makefileName
+=
cmake
::
GetCMakeFilesDirectory
()
;
makefileName
+=
"/CMakeFiles"
;
makefileName
+=
"/Makefile2"
;
cmGeneratedFileStream
makefileStream
(
makefileName
,
false
,
this
->
GetMakefileEncoding
());
...
...
@@ -268,7 +268,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
// see if the build system must be regenerated.
std
::
string
cmakefileName
=
this
->
GetCMakeInstance
()
->
GetHomeOutputDirectory
();
cmakefileName
+=
cmake
::
GetCMakeFilesDirectory
()
;
cmakefileName
+=
"/CMakeFiles"
;
cmakefileName
+=
"/Makefile.cmake"
;
cmGeneratedFileStream
cmakefileStream
(
cmakefileName
);
if
(
!
cmakefileStream
)
{
...
...
@@ -332,7 +332,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
// Build the path to the cache check file.
std
::
string
check
=
this
->
GetCMakeInstance
()
->
GetHomeOutputDirectory
();
check
+=
cmake
::
GetCMakeFilesDirectory
()
;
check
+=
"/CMakeFiles"
;
check
+=
"/cmake.check_cache"
;
// Set the corresponding makefile in the cmake file.
...
...
@@ -363,7 +363,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
for
(
cmLocalGenerator
*
localGen
:
this
->
LocalGenerators
)
{
lg
=
static_cast
<
cmLocalUnixMakefileGenerator3
*>
(
localGen
);
tmpStr
=
lg
->
GetCurrentBinaryDirectory
();
tmpStr
+=
cmake
::
GetCMakeFilesDirectory
()
;
tmpStr
+=
"/CMakeFiles"
;
tmpStr
+=
"/CMakeDirectoryInformation.cmake"
;
cmakefileStream
<<
"
\"
"
<<
lg
->
ConvertToRelativePath
(
binDir
,
tmpStr
)
<<
"
\"\n
"
;
...
...
@@ -572,7 +572,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules(
// Write the rule.
commands
.
clear
();
std
::
string
tmp
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
tmp
=
"CMakeFiles/"
;
tmp
+=
"Makefile2"
;
commands
.
push_back
(
lg
->
GetRecursiveMakeCall
(
tmp
.
c_str
(),
name
));
depends
.
clear
();
...
...
@@ -672,7 +672,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2(
cmLocalUnixMakefileGenerator3
::
EchoProgress
progress
;
progress
.
Dir
=
lg
->
GetBinaryDirectory
();
progress
.
Dir
+=
cmake
::
GetCMakeFilesDirectory
()
;
progress
.
Dir
+=
"/CMakeFiles"
;
{
std
::
ostringstream
progressArg
;
const
char
*
sep
=
""
;
...
...
@@ -726,7 +726,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2(
progCmd
<<
" "
<<
this
->
CountProgressMarksInTarget
(
gtarget
,
emitted
);
commands
.
push_back
(
progCmd
.
str
());
}
std
::
string
tmp
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
tmp
=
"CMakeFiles/"
;
tmp
+=
"Makefile2"
;
commands
.
push_back
(
lg
->
GetRecursiveMakeCall
(
tmp
.
c_str
(),
localName
));
{
...
...
Source/cmGlobalVisualStudio10Generator.cxx
View file @
3e867ed4
...
...
@@ -687,7 +687,7 @@ bool cmGlobalVisualStudio10Generator::FindVCTargetsPath(cmMakefile* mf)
wd
=
this
->
ConfiguredFilesPath
;
}
else
{
wd
=
this
->
GetCMakeInstance
()
->
GetHomeOutputDirectory
();
wd
+=
cmake
::
GetCMakeFilesDirectory
()
;
wd
+=
"/CMakeFiles"
;
}
wd
+=
"/"
;
wd
+=
cmVersion
::
GetCMakeVersion
();
...
...
@@ -986,7 +986,7 @@ std::string cmGlobalVisualStudio10Generator::GenerateRuleFile(
// The VS 10 generator needs to create the .rule files on disk.
// Hide them away under the CMakeFiles directory.
std
::
string
ruleDir
=
this
->
GetCMakeInstance
()
->
GetHomeOutputDirectory
();
ruleDir
+=
cmake
::
GetCMakeFilesDirectory
()
;
ruleDir
+=
"/CMakeFiles"
;
ruleDir
+=
"/"
;
ruleDir
+=
cmSystemTools
::
ComputeStringMD5
(
cmSystemTools
::
GetFilenamePath
(
output
).
c_str
());
...
...
Source/cmGlobalVisualStudio8Generator.cxx
View file @
3e867ed4
...
...
@@ -117,7 +117,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
// Create a list of all stamp files for this project.
std
::
vector
<
std
::
string
>
stamps
;
std
::
string
stampList
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
stampList
=
"CMakeFiles/"
;
stampList
+=
cmGlobalVisualStudio8Generator
::
GetGenerateStampList
();
{
std
::
string
stampListFile
=
...
...
@@ -129,7 +129,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
for
(
cmLocalGenerator
const
*
gi
:
generators
)
{
stampFile
=
gi
->
GetMakefile
()
->
GetCurrentBinaryDirectory
();
stampFile
+=
"/"
;
stampFile
+=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
stampFile
+=
"CMakeFiles/"
;
stampFile
+=
"generate.stamp"
;
fout
<<
stampFile
<<
"
\n
"
;
stamps
.
push_back
(
stampFile
);
...
...
Source/cmGlobalXCodeGenerator.cxx
View file @
3e867ed4
...
...
@@ -607,7 +607,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
std
::
string
checkCache
=
root
->
GetBinaryDirectory
();
checkCache
+=
"/"
;
checkCache
+=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
checkCache
+=
"CMakeFiles/"
;
checkCache
+=
"cmake.check_cache"
;
if
(
cm
->
DoWriteGlobVerifyTarget
())
{
...
...
@@ -1397,7 +1397,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
// language.
cmMakefile
*
mf
=
gtgt
->
Target
->
GetMakefile
();
std
::
string
fname
=
gtgt
->
GetLocalGenerator
()
->
GetCurrentBinaryDirectory
();
fname
+=
cmake
::
GetCMakeFilesDirectory
()
;
fname
+=
"/CMakeFiles"
;
fname
+=
"/"
;
fname
+=
gtgt
->
GetName
();
fname
+=
"-CMakeForceLinker"
;
...
...
@@ -3705,7 +3705,7 @@ std::string cmGlobalXCodeGenerator::ComputeInfoPListLocation(
cmGeneratorTarget
*
target
)
{
std
::
string
plist
=
target
->
GetLocalGenerator
()
->
GetCurrentBinaryDirectory
();
plist
+=
cmake
::
GetCMakeFilesDirectory
()
;
plist
+=
"/CMakeFiles"
;
plist
+=
"/"
;
plist
+=
target
->
GetName
();
plist
+=
".dir/Info.plist"
;
...
...
Source/cmInstallExportGenerator.cxx
View file @
3e867ed4
...
...
@@ -15,7 +15,6 @@
#include
"cmInstallType.h"
#include
"cmLocalGenerator.h"
#include
"cmSystemTools.h"
#include
"cmake.h"
cmInstallExportGenerator
::
cmInstallExportGenerator
(
cmExportSet
*
exportSet
,
const
char
*
destination
,
...
...
@@ -57,7 +56,7 @@ void cmInstallExportGenerator::ComputeTempDir()
// Choose a temporary directory in which to generate the import
// files to be installed.
this
->
TempDir
=
this
->
LocalGenerator
->
GetCurrentBinaryDirectory
();
this
->
TempDir
+=
cmake
::
GetCMakeFilesDirectory
()
;
this
->
TempDir
+=
"/CMakeFiles"
;
this
->
TempDir
+=
"/Export"
;
if
(
this
->
Destination
.
empty
())
{
return
;
...
...
Source/cmInstallTargetGenerator.cxx
View file @
3e867ed4
...
...
@@ -19,7 +19,6 @@
#include
"cmStateTypes.h"
#include
"cmSystemTools.h"
#include
"cmTarget.h"
#include
"cmake.h"
cmInstallTargetGenerator
::
cmInstallTargetGenerator
(
const
std
::
string
&
targetName
,
const
char
*
dest
,
bool
implib
,
...
...
@@ -102,7 +101,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(
if
(
this
->
Target
->
NeedRelinkBeforeInstall
(
config
))
{
fromDirConfig
=
this
->
Target
->
GetLocalGenerator
()
->
GetCurrentBinaryDirectory
();
fromDirConfig
+=
cmake
::
GetCMakeFilesDirectory
()
;
fromDirConfig
+=
"/CMakeFiles"
;
fromDirConfig
+=
"/CMakeRelink.dir/"
;
}
else
{
cmStateEnums
::
ArtifactType
artifact
=
this
->
ImportLibrary
...
...
Source/cmLocalNinjaGenerator.cxx
View file @
3e867ed4
...
...
@@ -106,7 +106,7 @@ void cmLocalNinjaGenerator::Generate()
std
::
string
cmLocalNinjaGenerator
::
GetTargetDirectory
(
cmGeneratorTarget
const
*
target
)
const
{
std
::
string
dir
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
dir
=
"CMakeFiles/"
;
dir
+=
target
->
GetName
();
#if defined(__VMS)
dir
+=
"_dir"
;
...
...
@@ -305,7 +305,7 @@ std::string cmLocalNinjaGenerator::WriteCommandScript(
scriptPath
=
target
->
GetSupportDirectory
();
}
else
{
scriptPath
=
this
->
GetCurrentBinaryDirectory
();
scriptPath
+=
cmake
::
GetCMakeFilesDirectory
()
;
scriptPath
+=
"/CMakeFiles"
;
}
cmSystemTools
::
MakeDirectory
(
scriptPath
);
scriptPath
+=
'/'
;
...
...
Source/cmLocalUnixMakefileGenerator3.cxx
View file @
3e867ed4
...
...
@@ -371,7 +371,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefileTargets(
depends
.
clear
();
// Build the target for this pass.
std
::
string
makefile2
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
makefile2
=
"CMakeFiles/"
;
makefile2
+=
"Makefile2"
;
commands
.
push_back
(
this
->
GetRecursiveMakeCall
(
makefile2
.
c_str
(),
localName
));
...
...
@@ -429,7 +429,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefileTargets(
void
cmLocalUnixMakefileGenerator3
::
WriteDirectoryInformationFile
()
{
std
::
string
infoFileName
=
this
->
GetCurrentBinaryDirectory
();
infoFileName
+=
cmake
::
GetCMakeFilesDirectory
()
;
infoFileName
+=
"/CMakeFiles"
;
infoFileName
+=
"/CMakeDirectoryInformation.cmake"
;
// Open the output file.
...
...
@@ -771,7 +771,7 @@ void cmLocalUnixMakefileGenerator3::WriteSpecialTargetsBottom(
cmOutputConverter
::
SHELL
);
commands
.
push_back
(
rescanRule
);
}
std
::
string
cmakefileName
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
cmakefileName
=
"CMakeFiles/"
;
cmakefileName
+=
"Makefile.cmake"
;
std
::
string
runRule
=
"$(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.
bool
needRescanDirInfo
=
false
;
std
::
string
dirInfoFile
=
this
->
GetCurrentBinaryDirectory
();
dirInfoFile
+=
cmake
::
GetCMakeFilesDirectory
()
;
dirInfoFile
+=
"/CMakeFiles"
;
dirInfoFile
+=
"/CMakeDirectoryInformation.cmake"
;
{
int
result
;
...
...
@@ -1362,7 +1362,7 @@ bool cmLocalUnixMakefileGenerator3::ScanDependencies(
cmMakefile
*
mf
=
this
->
Makefile
;
bool
haveDirectoryInfo
=
false
;
std
::
string
dirInfoFile
=
this
->
GetCurrentBinaryDirectory
();
dirInfoFile
+=
cmake
::
GetCMakeFilesDirectory
()
;
dirInfoFile
+=
"/CMakeFiles"
;
dirInfoFile
+=
"/CMakeDirectoryInformation.cmake"
;
if
(
mf
->
ReadListFile
(
dirInfoFile
.
c_str
())
&&
!
cmSystemTools
::
GetErrorOccuredFlag
())
{
...
...
@@ -1597,14 +1597,14 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
}
std
::
string
progressDir
=
this
->
GetBinaryDirectory
();
progressDir
+=
cmake
::
GetCMakeFilesDirectory
()
;
progressDir
+=
"/CMakeFiles"
;
{
std
::
ostringstream
progCmd
;
progCmd
<<
"$(CMAKE_COMMAND) -E cmake_progress_start "
;
progCmd
<<
this
->
ConvertToOutputFormat
(
cmSystemTools
::
CollapseFullPath
(
progressDir
),
cmOutputConverter
::
SHELL
);
std
::
string
progressFile
=
cmake
::
GetCMakeFilesDirectory
()
;
std
::
string
progressFile
=
"/CMakeFiles"
;
progressFile
+=
"/progress.marks"
;
std
::
string
progressFileNameFull
=
this
->
ConvertToFullPath
(
progressFile
);
progCmd
<<
" "
...
...
@@ -1613,7 +1613,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
cmOutputConverter
::
SHELL
);
commands
.
push_back
(
progCmd
.
str
());
}
std
::
string
mf2Dir
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
mf2Dir
=
"CMakeFiles/"
;
mf2Dir
+=
"Makefile2"
;
commands
.
push_back
(
this
->
GetRecursiveMakeCall
(
mf2Dir
.
c_str
(),
recursiveTarget
));
...
...
@@ -1682,7 +1682,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
cmOutputConverter
::
SHELL
);
commands
.
push_back
(
rescanRule
);
}
std
::
string
cmakefileName
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
cmakefileName
=
"CMakeFiles/"
;
cmakefileName
+=
"Makefile.cmake"
;
{
std
::
string
runRule
=
...
...
@@ -2027,7 +2027,7 @@ std::string cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(
std
::
string
cmLocalUnixMakefileGenerator3
::
GetTargetDirectory
(
cmGeneratorTarget
const
*
target
)
const
{
std
::
string
dir
=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
std
::
string
dir
=
"CMakeFiles/"
;
dir
+=
target
->
GetName
();
#if defined(__VMS)
dir
+=
"_dir"
;
...
...
Source/cmLocalVisualStudio7Generator.cxx
View file @
3e867ed4
...
...
@@ -97,7 +97,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
force_commands
.
push_back
(
force_command
);
std
::
string
no_main_dependency
;
std
::
string
force
=
this
->
GetCurrentBinaryDirectory
();
force
+=
cmake
::
GetCMakeFilesDirectory
()
;
force
+=
"/CMakeFiles"
;
force
+=
"/"
;
force
+=
l
->
GetName
();
force
+=
"_force"
;
...
...
@@ -144,7 +144,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
// Touch a timestamp file used to determine when the project file is
// out of date.
std
::
string
stampName
=
this
->
GetCurrentBinaryDirectory
();
stampName
+=
cmake
::
GetCMakeFilesDirectory
()
;
stampName
+=
"/CMakeFiles"
;
cmSystemTools
::
MakeDirectory
(
stampName
.
c_str
());
stampName
+=
"/"
;
stampName
+=
"generate.stamp"
;
...
...
@@ -254,7 +254,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
std
::
string
stampName
=
this
->
GetCurrentBinaryDirectory
();
stampName
+=
"/"
;
stampName
+=
cmake
::
GetCMakeFilesDirectoryPostSlash
()
;
stampName
+=
"CMakeFiles/"
;
stampName
+=
"generate.stamp"
;
cmCustomCommandLine
commandLine
;
commandLine
.
push_back
(
cmSystemTools
::
GetCMakeCommand
());
...
...
Source/cmMakefile.cxx
View file @
3e867ed4
...
...
@@ -1138,7 +1138,7 @@ cmTarget* cmMakefile::AddUtilityCommand(
// Store the custom command in the target.
if
(
!
commandLines
.
empty
()
||
!
depends
.
empty
())
{
std
::
string
force
=
this
->
GetCurrentBinaryDirectory
();
force
+=
cmake
::
GetCMakeFilesDirectory
()
;
force
+=
"/CMakeFiles"
;
force
+=
"/"
;
force
+=
utilityName
;
std
::
vector
<
std
::
string
>
forced
;
...
...
@@ -1492,7 +1492,7 @@ void cmMakefile::Configure()
// make sure the CMakeFiles dir is there
std
::
string
filesDir
=
this
->
StateSnapshot
.
GetDirectory
().
GetCurrentBinary
();
filesDir
+=
cmake
::
GetCMakeFilesDirectory
()
;
filesDir
+=
"/CMakeFiles"
;
cmSystemTools
::
MakeDirectory
(
filesDir
);
assert
(
cmSystemTools
::
FileExists
(
currentStart
,
true
));
...
...
@@ -2720,8 +2720,7 @@ bool cmMakefile::IsProjectFile(const char* filename) const
{
return
cmSystemTools
::
IsSubDirectory
(
filename
,
this
->
GetHomeDirectory
())
||
(
cmSystemTools
::
IsSubDirectory
(
filename
,
this
->
GetHomeOutputDirectory
())
&&
!
cmSystemTools
::
IsSubDirectory
(
filename
,
cmake
::
GetCMakeFilesDirectory
()));
!
cmSystemTools
::
IsSubDirectory
(
filename
,
"/CMakeFiles"
));
}
MessageType
cmMakefile
::
ExpandVariablesInStringNew
(
...
...
Source/cmMakefileExecutableTargetGenerator.cxx
View file @
3e867ed4
...
...
@@ -25,7 +25,6 @@
#include
"cmStateSnapshot.h"
#include
"cmStateTypes.h"
#include
"cmSystemTools.h"
#include
"cmake.h"
cmMakefileExecutableTargetGenerator
::
cmMakefileExecutableTargetGenerator
(
cmGeneratorTarget
*
target
)
...
...
@@ -317,7 +316,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
std
::
string
outpathImp
;
if
(
relink
)
{
outpath
=
this
->
Makefile
->
GetCurrentBinaryDirectory
();
outpath
+=
cmake
::
GetCMakeFilesDirectory
()
;
outpath
+=
"/CMakeFiles"
;
outpath
+=
"/CMakeRelink.dir"
;
cmSystemTools
::
MakeDirectory
(
outpath
);
outpath
+=
"/"
;
...
...
Source/cmMakefileLibraryTargetGenerator.cxx
View file @
3e867ed4
...
...
@@ -25,7 +25,6 @@
#include
"cmStateSnapshot.h"
#include
"cmStateTypes.h"
#include
"cmSystemTools.h"
#include
"cmake.h"
cmMakefileLibraryTargetGenerator
::
cmMakefileLibraryTargetGenerator
(
cmGeneratorTarget
*
target
)
...
...
@@ -499,7 +498,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
outpath
+=
"/"
;
}
else
if
(
relink
)
{
outpath
=
this
->
Makefile
->
GetCurrentBinaryDirectory
();
outpath
+=
cmake
::
GetCMakeFilesDirectory
()
;
outpath
+=
"/CMakeFiles"
;
outpath
+=
"/CMakeRelink.dir"
;
cmSystemTools
::
MakeDirectory
(
outpath
);
outpath
+=
"/"
;
...
...
Prev
1
2
Next
Brad King
@brad.king
mentioned in commit
40745ad3
·
Jan 25, 2019
mentioned in commit
40745ad3
mentioned in commit 40745ad35ac57b437dcd6d74e846e9cd9743808f
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment