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/cmInstallTargetGenerator.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/cmInstallTargetGenerator.cxx')
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 08f46aa..d1d4316 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -19,7 +19,6 @@ #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmTarget.h" -#include "cmake.h" cmInstallTargetGenerator::cmInstallTargetGenerator( 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 |