diff options
| author | Eugene Shalygin <eugene.shalygin@gmail.com> | 2021-07-20 18:08:17 (GMT) |
|---|---|---|
| committer | Eugene Shalygin <eugene.shalygin@gmail.com> | 2021-07-22 11:08:58 (GMT) |
| commit | 55e4753bbb60c0da12b09837bac97a46b851ae32 (patch) | |
| tree | 392f9c7e46d7b45c95c60f7ce7b5a92fa0831623 /Source/cmInstallCommand.cxx | |
| parent | 26a76cf46d5209aec03d941fee203d23172dde75 (diff) | |
| download | CMake-55e4753bbb60c0da12b09837bac97a46b851ae32.zip CMake-55e4753bbb60c0da12b09837bac97a46b851ae32.tar.gz CMake-55e4753bbb60c0da12b09837bac97a46b851ae32.tar.bz2 | |
Refactor cmTargetExport removing InterfaceIncludeDirecories
Because of this property in the cmTargetExport struct, exporting targets
is not uniform: top-level ones have to be dealt with via the
cmTargetExport objects, while all linked ones are cmGeneratorTarget
objects. Let's pass this additional includedirectories via a special
target property making handling exported targets uniform.
Diffstat (limited to 'Source/cmInstallCommand.cxx')
| -rw-r--r-- | Source/cmInstallCommand.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 79109b5..687741b 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -36,6 +36,7 @@ #include "cmMessageType.h" #include "cmPolicies.h" #include "cmProperty.h" +#include "cmRange.h" #include "cmRuntimeDependencyArchive.h" #include "cmStateTypes.h" #include "cmStringAlgorithms.h" @@ -681,8 +682,8 @@ bool HandleTargetsMode(std::vector<std::string> const& args, te->LibraryGenerator = libraryGenerator.get(); te->RuntimeGenerator = runtimeGenerator.get(); te->ObjectsGenerator = objectGenerator.get(); - te->InterfaceIncludeDirectories = - cmJoin(includesArgs.GetIncludeDirs(), ";"); + target.AddInstallIncludeDirectories( + cmMakeRange(includesArgs.GetIncludeDirs())); te->NamelinkOnly = namelinkOnly; helper.Makefile->GetGlobalGenerator() ->GetExportSets()[exports] |