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/cmInstallExportGenerator.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/cmInstallExportGenerator.cxx')
-rw-r--r-- | Source/cmInstallExportGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 98a895e..47b9785 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -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; |