summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorBruno Manganelli <bruno.manga95@gmail.com>2018-11-22 21:05:05 (GMT)
committerBruno Manganelli <bruno.manga95@gmail.com>2019-01-21 15:34:16 (GMT)
commit3e867ed4003e33ace2de6027f9bedb9aa7718b0c (patch)
tree9fe1b65a8b7e96c9a964761089dd1d48d5385937 /Source/cmake.cxx
parentc144db1b8ca1ea2e3dad397123f110956a439030 (diff)
downloadCMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.zip
CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.gz
CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.bz2
cmake: inlined files dir constant and removed it from cmake.h
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c65bd2e..46f1a17 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -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
// itself, there is the risk of building an out-of-date solution file due
// to limitations of the underlying build system.
- std::string const stampList = cachePath + "/" +
- GetCMakeFilesDirectoryPostSlash() +
+ std::string const stampList = cachePath + "/" + "CMakeFiles/" +
cmGlobalVisualStudio9Generator::GetGenerateStampList();
// 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
this->AddScriptingCommands();
if (this->GlobalGenerator->MatchesGeneratorName("Visual Studio 9 2008")) {
- std::string const globVerifyScript = cachePath + "/" +
- GetCMakeFilesDirectoryPostSlash() + "VerifyGlobs.cmake";
+ std::string const globVerifyScript =
+ cachePath + "/" + "CMakeFiles/" + "VerifyGlobs.cmake";
if (cmSystemTools::FileExists(globVerifyScript)) {
std::vector<std::string> args;
this->ReadListFile(args, globVerifyScript.c_str());