From 6458a322421dcf097c319321736fb7fd72549078 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 5 Oct 2021 09:47:19 -0400 Subject: bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2 Fixes: #22721 --- Source/cmCommands.cxx | 4 ++-- 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); diff --git a/bootstrap b/bootstrap index dc5ed0b..c7fbed1 100755 --- a/bootstrap +++ b/bootstrap @@ -297,6 +297,7 @@ CMAKE_CXX_SOURCES="\ cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool \ cmBreakCommand \ cmBuildCommand \ + cmCMakeLanguageCommand \ cmCMakeMinimumRequired \ cmCMakePath \ cmCMakePathCommand \ -- cgit v0.12