diff options
| author | Orkun Tokdemir <ilhanorkuntokdemir@gmail.com> | 2023-10-13 17:14:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-10-13 18:16:26 (GMT) |
| commit | c074f5c81e04c032c976862a379297b8ba3bf3f8 (patch) | |
| tree | e8b3727f0ad440b604dc343da8e4a8ed19446189 /Source/cmcmd.cxx | |
| parent | 06a9b25b17759d754e2b542b8464f01a90e92a8e (diff) | |
| download | CMake-c074f5c81e04c032c976862a379297b8ba3bf3f8.zip CMake-c074f5c81e04c032c976862a379297b8ba3bf3f8.tar.gz CMake-c074f5c81e04c032c976862a379297b8ba3bf3f8.tar.bz2 | |
Autogen: Revert "AUTO*_EXECUTABLE: add support for per-config values"
Changing the `timestamp` file to `timestamp_$<CONFIG>` causes some user
projects to break when using Qt versions older than 6.6.
Revert commit fddd0f0443 (Autogen: AUTO*_EXECUTABLE: add support for
per-config values, 2023-06-14, v3.28.0-rc1~96^2~1) pending further
investigation.
Issue: #20074
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 3dcfbf1..43a945f 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1433,17 +1433,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args, if ((args[1] == "cmake_autogen") && (args.size() >= 4)) { cm::string_view const infoFile = args[2]; cm::string_view const config = args[3]; - cm::string_view const executableConfig = - (args.size() >= 5) ? cm::string_view(args[4]) : cm::string_view(); - return cmQtAutoMocUic(infoFile, config, executableConfig) ? 0 : 1; + return cmQtAutoMocUic(infoFile, config) ? 0 : 1; } if ((args[1] == "cmake_autorcc") && (args.size() >= 3)) { cm::string_view const infoFile = args[2]; cm::string_view const config = (args.size() > 3) ? cm::string_view(args[3]) : cm::string_view(); - cm::string_view const executableConfig = - (args.size() >= 5) ? cm::string_view(args[4]) : cm::string_view(); - return cmQtAutoRcc(infoFile, config, executableConfig) ? 0 : 1; + return cmQtAutoRcc(infoFile, config) ? 0 : 1; } #endif |