diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 17:54:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-08 17:54:07 (GMT) |
| commit | 21c92a00bf50afedf52388c5f5a73cba7f756561 (patch) | |
| tree | 22bca046cd862fbdbcda32fad17d58aaff0eed48 | |
| parent | f5690cc57c0cd18ee8619332379f523c8fac46a1 (diff) | |
| parent | 4ab7d407a5e46f91bf57fb1f9be7387ba989e0ec (diff) | |
| download | CMake-21c92a00bf50afedf52388c5f5a73cba7f756561.zip CMake-21c92a00bf50afedf52388c5f5a73cba7f756561.tar.gz CMake-21c92a00bf50afedf52388c5f5a73cba7f756561.tar.bz2 | |
Merge topic 'minor-cleanups'
4ab7d407 cmExportTryCompileFileGenerator: Add newline between methods.
e133e409 cmExportTryCompileFileGenerator: Remove unused variable.
c197c692 cmDocumentation: Remove unused include.
| -rw-r--r-- | Source/cmDocumentation.h | 1 | ||||
| -rw-r--r-- | Source/cmExportTryCompileFileGenerator.cxx | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h index 8854c36..b6c5fde 100644 --- a/Source/cmDocumentation.h +++ b/Source/cmDocumentation.h @@ -13,7 +13,6 @@ #define _cmDocumentation_h #include "cmStandardIncludes.h" -#include "cmProperty.h" #include "cmDocumentationFormatter.h" #include "cmDocumentationSection.h" #include "cmake.h" diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx index eb8d193..dfb991b 100644 --- a/Source/cmExportTryCompileFileGenerator.cxx +++ b/Source/cmExportTryCompileFileGenerator.cxx @@ -99,8 +99,6 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target, || i->first.find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0 || i->first.find("INTERFACE_LINK_LIBRARIES") == 0) { - const std::string libs = i->second.GetValue(); - std::string evalResult = this->FindTargets(i->first, target, emitted); @@ -118,6 +116,7 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target, } } } + std::string cmExportTryCompileFileGenerator::InstallNameDir(cmTarget* target, const std::string& config) |