diff options
| author | tophoo <30765654+tophoo@users.noreply.github.com> | 2023-11-08 15:35:27 (GMT) |
|---|---|---|
| committer | tophoo <30765654+tophoo@users.noreply.github.com> | 2023-11-16 15:29:29 (GMT) |
| commit | 232610e60ec5546d8c8460a006af9417004def00 (patch) | |
| tree | 6c2c46b0568b621f3496f060f8481f4cbca815ed /Source | |
| parent | 7a07887055d8acd1d367c640ca069734fdf49fa4 (diff) | |
| download | CMake-232610e60ec5546d8c8460a006af9417004def00.zip CMake-232610e60ec5546d8c8460a006af9417004def00.tar.gz CMake-232610e60ec5546d8c8460a006af9417004def00.tar.bz2 | |
Autogen: Use new API for limiting autogen command line lengths
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGen.cxx | 7 | ||||
| -rw-r--r-- | Source/cmQtAutoGen.h | 5 | ||||
| -rw-r--r-- | Source/cmQtAutoMocUic.cxx | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx index adbdba8..0a394b5 100644 --- a/Source/cmQtAutoGen.cxx +++ b/Source/cmQtAutoGen.cxx @@ -76,13 +76,6 @@ static void MergeOptions(std::vector<std::string>& baseOpts, unsigned int const cmQtAutoGen::ParallelMax = 64; -#ifdef _WIN32 -// Actually 32767 (see -// https://devblogs.microsoft.com/oldnewthing/20031210-00/?p=41553) but we -// allow for a small margin -size_t const cmQtAutoGen::CommandLineLengthMax = 32000; -#endif - cm::string_view cmQtAutoGen::GeneratorName(GenT genType) { switch (genType) { diff --git a/Source/cmQtAutoGen.h b/Source/cmQtAutoGen.h index d111422..5a23ae9 100644 --- a/Source/cmQtAutoGen.h +++ b/Source/cmQtAutoGen.h @@ -64,11 +64,6 @@ public: /// @brief Maximum number of parallel threads/processes in a generator static unsigned int const ParallelMax; -#ifdef _WIN32 - /// @brief Maximum number of characters on command line - static size_t const CommandLineLengthMax; -#endif - /// @brief Returns the generator name static cm::string_view GeneratorName(GenT genType); /// @brief Returns the generator name in upper case diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 83256ed..a49125e 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -887,6 +887,8 @@ void cmQtAutoMocUicT::JobMocPredefsT::Process() cm::append(cmd, this->MocConst().OptionsDefinitions); // Add includes cm::append(cmd, this->MocConst().OptionsIncludes); + // Check if response file is necessary + MaybeWriteResponseFile(this->MocConst().PredefsFileAbs, cmd); // Execute command if (!this->RunProcess(GenT::MOC, result, cmd, reason.get())) { this->LogCommandError(GenT::MOC, |