diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-30 10:19:28 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-06 14:59:25 (GMT) |
commit | 2e18801a1bf4e313fc2ec25d9a8842312728e1be (patch) | |
tree | 5b5261e17b19967c31433e1599837125e6eb1f0a /Source/cmQtAutoGeneratorInitializer.cxx | |
parent | 048aac2cf99061c5fc13a67fb707b064db5c8660 (diff) | |
download | CMake-2e18801a1bf4e313fc2ec25d9a8842312728e1be.zip CMake-2e18801a1bf4e313fc2ec25d9a8842312728e1be.tar.gz CMake-2e18801a1bf4e313fc2ec25d9a8842312728e1be.tar.bz2 |
QtAutogen: Move util functions to file begin
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
-rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index df15920..d444039 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -35,6 +35,26 @@ #include <utility> #include <vector> +static void utilCopyTargetProperty(cmTarget* destinationTarget, + cmTarget* sourceTarget, + const std::string& propertyName) +{ + const char* propertyValue = sourceTarget->GetProperty(propertyName); + if (propertyValue) { + destinationTarget->SetProperty(propertyName, propertyValue); + } +} + +static std::string utilStripCR(std::string const& line) +{ + // Strip CR characters rcc may have printed (possibly more than one!). + std::string::size_type cr = line.find('\r'); + if (cr != line.npos) { + return line.substr(0, cr); + } + return line; +} + static std::string GetAutogenTargetName(cmGeneratorTarget const* target) { std::string autogenTargetName = target->GetName(); @@ -404,26 +424,6 @@ static void RccMergeOptions(std::vector<std::string>& opts, opts.insert(opts.end(), extraOpts.begin(), extraOpts.end()); } -static void utilCopyTargetProperty(cmTarget* destinationTarget, - cmTarget* sourceTarget, - const std::string& propertyName) -{ - const char* propertyValue = sourceTarget->GetProperty(propertyName); - if (propertyValue) { - destinationTarget->SetProperty(propertyName, propertyValue); - } -} - -static std::string utilStripCR(std::string const& line) -{ - // Strip CR characters rcc may have printed (possibly more than one!). - std::string::size_type cr = line.find('\r'); - if (cr != line.npos) { - return line.substr(0, cr); - } - return line; -} - /// @brief Reads the resource files list from from a .qrc file - Qt5 version /// @return True if the .qrc file was successfully parsed static bool RccListInputsQt5(cmSourceFile* sf, cmGeneratorTarget const* target, |