diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-14 17:35:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-14 17:35:57 (GMT) |
| commit | ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba (patch) | |
| tree | 667dcc41f74ca7c4c541a051219c398f544d6eac /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | 2380896a056a29f22dd440369f4ab30137306ab9 (diff) | |
| parent | 1fdccff5894914d4408e64c0b55e52c376e64ad4 (diff) | |
| download | CMake-ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba.zip CMake-ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba.tar.gz CMake-ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba.tar.bz2 | |
Merge topic 'use-generator-target'
1fdccff5 Genex: Port implementation detail to cmGeneratorTarget.
ce75c86e cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
526cc7dc cmGeneratorTarget: Move HasImportLibrary from cmTarget.
8d2e3e53 cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.
a143d4ac Sublime: Port some API to cmGeneratorTarget.
993aace7 cmGeneratorTarget: Port processILibs to cmGeneratorTarget.
43ade995 cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.
5fd2f43f cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.
f7acd742 cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.
763f7b19 cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.
ceb35b63 cmLinkItem: Port to cmGeneratorTarget.
bf2d061a cmGeneratorTarget: Move FindTargetToLink from cmTarget.
61c02dec cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.
9ca4cae5 cmGeneratorTarget: Move GetUtilityItems from cmTarget.
d6b394ed cmComputeLinkDepends: Port result API to cmGeneratorTarget.
7c8236ef cmComputeLinkInformation: Port result API to cmGeneratorTarget.
...
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 378f132..6e3f65f 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target, std::string basename = cmsys::SystemTools:: GetFilenameWithoutLastExtension(absFile); - std::string rcc_output_dir = target->Target->GetSupportDirectory(); + std::string rcc_output_dir = target->GetSupportDirectory(); cmSystemTools::MakeDirectory(rcc_output_dir.c_str()); std::string rcc_output_file = rcc_output_dir; rcc_output_file += "/qrc_" + basename + ".cpp"; @@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget( std::string basename = cmsys::SystemTools:: GetFilenameWithoutLastExtension(absFile); - std::string rcc_output_dir = target->Target->GetSupportDirectory(); + std::string rcc_output_dir = target->GetSupportDirectory(); cmSystemTools::MakeDirectory(rcc_output_dir.c_str()); std::string rcc_output_file = rcc_output_dir; rcc_output_file += "/qrc_" + basename + ".cpp"; |