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:29:00 (GMT) |
| commit | 50b8b509c7900b8ac725f9556c3b1bf94c14bd57 (patch) | |
| tree | ef11cef530d49fc46228b6c05710abf2b67fe139 /Source | |
| parent | e1508290453c99b003a4863c574752faa193e0c8 (diff) | |
| parent | 6458a322421dcf097c319321736fb7fd72549078 (diff) | |
| download | CMake-50b8b509c7900b8ac725f9556c3b1bf94c14bd57.zip CMake-50b8b509c7900b8ac725f9556c3b1bf94c14bd57.tar.gz CMake-50b8b509c7900b8ac725f9556c3b1bf94c14bd57.tar.bz2 | |
Merge topic 'bootstrap-qt6'
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCommands.cxx | 4 |
1 files changed, 2 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); |