Commit fcfbc01d authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'cmTarget_pimpl'

de0d57c9 cmTarget: Use std::unique_ptr instead of custom smart pointer
ecc782c7 cmTarget: Single line comment clanups
be2764a6 cmTarget: Make private `SetPropertyDefault` an in code lambda `InitProperty`
2bfee8a5 cmTarget: Remove obsolete `friend` definitions
a65a4041 cmTarget: Inline private HasImportLibrary method
ff91071a cmTarget: Move member method `CheckImportedLibName` to impl
afc4612f cmTarget: Move member method `ProcessSourceItemCMP0049()` to impl
72b0eeeb cmTarget: Move member booleans to impl
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer's avatarDaniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !3142
parents c518f305 de0d57c9
......@@ -262,7 +262,7 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
this->DLLPlatform =
!this->Makefile->GetSafeDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX").empty();
this->PolicyMap = t->PolicyMap;
this->PolicyMap = t->GetPolicyMap();
}
cmGeneratorTarget::~cmGeneratorTarget()
......
......@@ -12,6 +12,7 @@
#include "cmAlgorithms.h"
#include "cmCallVisualStudioMacro.h"
#include "cmCustomCommand.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include "cmLocalVisualStudioGenerator.h"
......
......@@ -12,6 +12,7 @@
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommand.h"
#include "cmCustomCommandGenerator.h"
#include "cmDocumentationEntry.h"
#include "cmGeneratedFileStream.h"
......
......@@ -40,8 +40,8 @@ bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args,
} else {
cmTargets::iterator ti = tgts.find(*s);
if (ti != tgts.end()) {
ti->second.SetInstallPath(args[0].c_str());
ti->second.SetRuntimeInstallPath(runtime_dir.c_str());
ti->second.SetInstallPath(args[0]);
ti->second.SetRuntimeInstallPath(runtime_dir);
ti->second.SetHaveInstallRule(true);
} else {
std::string str = "Cannot find target: \"" + *s + "\" to install.";
......
......@@ -11,6 +11,7 @@
#include <utility>
#include "cmAlgorithms.h"
#include "cmCustomCommand.h" // IWYU pragma: keep
#include "cmCustomCommandGenerator.h"
#include "cmFileTimeCache.h"
#include "cmGeneratedFileStream.h"
......
......@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmLocalVisualStudio7Generator.h"
#include "cmCustomCommand.h"
#include "cmCustomCommandGenerator.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalVisualStudio7Generator.h"
......
......@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmLocalVisualStudioGenerator.h"
#include "cmCustomCommand.h"
#include "cmCustomCommandGenerator.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
......
......@@ -12,6 +12,7 @@
#include <utility>
#include "cmAlgorithms.h"
#include "cmCustomCommand.h" // IWYU pragma: keep
#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
......@@ -32,8 +33,6 @@
#include "cmStateTypes.h"
#include "cmSystemTools.h"
class cmCustomCommand;
cmNinjaNormalTargetGenerator::cmNinjaNormalTargetGenerator(
cmGeneratorTarget* target)
: cmNinjaTargetGenerator(target)
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,6 +4,7 @@
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommand.h"
#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorExpression.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment