diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-06 14:28:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-06 14:28:59 (GMT) |
| commit | b82e7ed5eb0ea12e12f215dab09031e6c2a16d45 (patch) | |
| tree | 94e3391932ba35e3a15b5d1faa38a1b0da813322 | |
| parent | cd51eba584e29b4812557aba766b80598b1509a0 (diff) | |
| parent | 6458a322421dcf097c319321736fb7fd72549078 (diff) | |
| download | CMake-b82e7ed5eb0ea12e12f215dab09031e6c2a16d45.zip CMake-b82e7ed5eb0ea12e12f215dab09031e6c2a16d45.tar.gz CMake-b82e7ed5eb0ea12e12f215dab09031e6c2a16d45.tar.bz2 | |
Merge topic 'bootstrap-qt6' into release-3.21
6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Andrew Maclean <andrew.amaclean@gmail.com>
Merge-request: !6593
| -rw-r--r-- | Source/cmCommands.cxx | 4 | ||||
| -rwxr-xr-x | bootstrap | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index a241a3a..c6296f9 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -16,6 +16,7 @@ #include "cmAddTestCommand.h" #include "cmBreakCommand.h" #include "cmBuildCommand.h" +#include "cmCMakeLanguageCommand.h" #include "cmCMakeMinimumRequired.h" #include "cmCMakePathCommand.h" #include "cmCMakePolicyCommand.h" @@ -93,7 +94,6 @@ # include "cmAuxSourceDirectoryCommand.h" # include "cmBuildNameCommand.h" # include "cmCMakeHostSystemInformationCommand.h" -# include "cmCMakeLanguageCommand.h" # include "cmExportCommand.h" # include "cmExportLibraryDependenciesCommand.h" # include "cmFLTKWrapUICommand.h" @@ -128,6 +128,7 @@ void GetScriptingCommands(cmState* state) state->AddFlowControlCommand("return", cmReturnCommand); state->AddFlowControlCommand("while", cmWhileCommand); + state->AddBuiltinCommand("cmake_language", cmCMakeLanguageCommand); state->AddBuiltinCommand("cmake_minimum_required", cmCMakeMinimumRequired); state->AddBuiltinCommand("cmake_path", cmCMakePathCommand); state->AddBuiltinCommand("cmake_policy", cmCMakePolicyCommand); @@ -202,7 +203,6 @@ void GetScriptingCommands(cmState* state) #if !defined(CMAKE_BOOTSTRAP) state->AddBuiltinCommand("cmake_host_system_information", cmCMakeHostSystemInformationCommand); - state->AddBuiltinCommand("cmake_language", cmCMakeLanguageCommand); state->AddBuiltinCommand("load_cache", cmLoadCacheCommand); state->AddBuiltinCommand("remove", cmRemoveCommand); state->AddBuiltinCommand("variable_watch", cmVariableWatchCommand); @@ -297,6 +297,7 @@ CMAKE_CXX_SOURCES="\ cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool \ cmBreakCommand \ cmBuildCommand \ + cmCMakeLanguageCommand \ cmCMakeMinimumRequired \ cmCMakePath \ cmCMakePathCommand \ |