diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-02 13:53:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-02 13:53:07 (GMT) |
| commit | 8387aa20f2c8ba870a8349665e2469f0e064f0b2 (patch) | |
| tree | 15d5f1572f67439e161f183bbeaff6fe7ed31621 /Source/cmMakefile.cxx | |
| parent | 193cba5d92f6b799119a4e0247e06beda56aa040 (diff) | |
| parent | 255df8622bc42c62bd8bc81d2ff2964ef8d6a803 (diff) | |
| download | CMake-8387aa20f2c8ba870a8349665e2469f0e064f0b2.zip CMake-8387aa20f2c8ba870a8349665e2469f0e064f0b2.tar.gz CMake-8387aa20f2c8ba870a8349665e2469f0e064f0b2.tar.bz2 | |
Merge topic 'issue-19198'
255df8622b file(GENERATE): Support new line style
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5649
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index f479af1..e485986 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -865,13 +865,13 @@ void cmMakefile::EnforceDirectoryLevelRules() const void cmMakefile::AddEvaluationFile( const std::string& inputFile, const std::string& targetName, std::unique_ptr<cmCompiledGeneratorExpression> outputName, - std::unique_ptr<cmCompiledGeneratorExpression> condition, mode_t permissions, - bool inputIsContent) + std::unique_ptr<cmCompiledGeneratorExpression> condition, + const std::string& newLineCharacter, mode_t permissions, bool inputIsContent) { this->EvaluationFiles.push_back( cm::make_unique<cmGeneratorExpressionEvaluationFile>( inputFile, targetName, std::move(outputName), std::move(condition), - inputIsContent, permissions, + inputIsContent, newLineCharacter, permissions, this->GetPolicyStatus(cmPolicies::CMP0070))); } |