diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 12:59:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 13:01:26 (GMT) |
| commit | 40745ad35ac57b437dcd6d74e846e9cd9743808f (patch) | |
| tree | 61d36e870f9a922c775fd7b4b2eb362ddc13fd07 /Source/cmMakefile.cxx | |
| parent | c18fc30d1a0c67780fdea4ccd0a84a601ad7e8ef (diff) | |
| parent | 3e867ed4003e33ace2de6027f9bedb9aa7718b0c (diff) | |
| download | CMake-40745ad35ac57b437dcd6d74e846e9cd9743808f.zip CMake-40745ad35ac57b437dcd6d74e846e9cd9743808f.tar.gz CMake-40745ad35ac57b437dcd6d74e846e9cd9743808f.tar.bz2 | |
Merge topic 'cmake-files-directory'
3e867ed400 cmake: inlined files dir constant and removed it from cmake.h
Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: vvs31415 <vstakhovsky@fastmail.com>
Merge-request: !2655
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 500776e..82fb160 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1139,7 +1139,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; @@ -1493,7 +1493,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)); @@ -2721,8 +2721,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( |