diff options
| author | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-11-22 21:05:05 (GMT) |
|---|---|---|
| committer | Bruno Manganelli <bruno.manga95@gmail.com> | 2019-01-21 15:34:16 (GMT) |
| commit | 3e867ed4003e33ace2de6027f9bedb9aa7718b0c (patch) | |
| tree | 9fe1b65a8b7e96c9a964761089dd1d48d5385937 /Source/cmMakefile.cxx | |
| parent | c144db1b8ca1ea2e3dad397123f110956a439030 (diff) | |
| download | CMake-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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 274c631..4a6f921 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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( |