From 75161b34b695aa6b9b866da71b12bde5a5150b71 Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Thu, 16 Jul 2026 12:41:49 -0400 Subject: [PATCH] bootstrap: Remove deprecated commands Remove deprecated commands from the bootstrap build. Some had been removed already; this removes the rest. --- Source/cmCommands.cxx | 16 ++++++++-------- bootstrap | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index 9e0d2e4045..355d4b49ba 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -52,13 +52,10 @@ #include "cmIncludeGuardCommand.h" #include "cmIncludeRegularExpressionCommand.h" #include "cmInstallCommand.h" -#include "cmInstallFilesCommand.h" -#include "cmInstallTargetsCommand.h" #include "cmInstrumentationCommand.h" #include "cmLinkDirectoriesCommand.h" #include "cmListCommand.h" #include "cmMacroCommand.h" -#include "cmMakeDirectoryCommand.h" #include "cmMarkAsAdvancedCommand.h" #include "cmMathCommand.h" #include "cmMessageCommand.h" @@ -77,7 +74,6 @@ #include "cmSiteNameCommand.h" #include "cmState.h" #include "cmStringCommand.h" -#include "cmSubdirCommand.h" #include "cmTargetCompileDefinitionsCommand.h" #include "cmTargetCompileFeaturesCommand.h" #include "cmTargetCompileOptionsCommand.h" @@ -101,14 +97,18 @@ # include "cmFLTKWrapUICommand.h" # include "cmFileAPICommand.h" # include "cmIncludeExternalMSProjectCommand.h" +# include "cmInstallFilesCommand.h" # include "cmInstallProgramsCommand.h" +# include "cmInstallTargetsCommand.h" # include "cmLinkLibrariesCommand.h" # include "cmLoadCacheCommand.h" +# include "cmMakeDirectoryCommand.h" # include "cmQTWrapCPPCommand.h" # include "cmQTWrapUICommand.h" # include "cmRemoveCommand.h" # include "cmRemoveDefinitionsCommand.h" # include "cmSourceGroupCommand.h" +# include "cmSubdirCommand.h" # include "cmTargetLinkDirectoriesCommand.h" # include "cmVariableWatchCommand.h" # include "cmWriteFileCommand.h" @@ -148,7 +148,6 @@ void GetScriptingCommands(cmState* state) state->AddBuiltinCommand("include", cmIncludeCommand); state->AddBuiltinCommand("include_guard", cmIncludeGuardCommand); state->AddBuiltinCommand("list", cmListCommand); - state->AddBuiltinCommand("make_directory", cmMakeDirectoryCommand); state->AddBuiltinCommand("mark_as_advanced", cmMarkAsAdvancedCommand); state->AddBuiltinCommand("math", cmMathCommand); state->AddBuiltinCommand("message", cmMessageCommand); @@ -207,6 +206,7 @@ void GetScriptingCommands(cmState* state) cmCMakeHostSystemInformationCommand); state->AddBuiltinCommand("cmake_pkg_config", cmCMakePkgConfigCommand); state->AddBuiltinCommand("load_cache", cmLoadCacheCommand); + state->AddBuiltinCommand("make_directory", cmMakeDirectoryCommand); state->AddBuiltinCommand("remove", cmRemoveCommand); state->AddBuiltinCommand("variable_watch", cmVariableWatchCommand); state->AddBuiltinCommand("write_file", cmWriteFileCommand); @@ -251,8 +251,6 @@ void GetProjectCommands(cmState* state) state->AddBuiltinCommand("include_regular_expression", cmIncludeRegularExpressionCommand); state->AddBuiltinCommand("install", cmInstallCommand); - state->AddBuiltinCommand("install_files", cmInstallFilesCommand); - state->AddBuiltinCommand("install_targets", cmInstallTargetsCommand); state->AddBuiltinCommand("link_directories", cmLinkDirectoriesCommand); state->AddBuiltinCommand("project", cmProjectCommand); state->AddBuiltinCommand("set_source_files_properties", @@ -261,7 +259,6 @@ void GetProjectCommands(cmState* state) cmSetTargetPropertiesCommand); state->AddBuiltinCommand("set_tests_properties", cmSetTestsPropertiesCommand); - state->AddBuiltinCommand("subdirs", cmSubdirCommand); state->AddBuiltinCommand("target_compile_definitions", cmTargetCompileDefinitionsCommand); state->AddBuiltinCommand("target_compile_features", @@ -287,7 +284,9 @@ void GetProjectCommands(cmState* state) state->AddBuiltinCommand("fltk_wrap_ui", cmFLTKWrapUICommand); state->AddBuiltinCommand("include_external_msproject", cmIncludeExternalMSProjectCommand); + state->AddBuiltinCommand("install_files", cmInstallFilesCommand); state->AddBuiltinCommand("install_programs", cmInstallProgramsCommand); + state->AddBuiltinCommand("install_targets", cmInstallTargetsCommand); state->AddBuiltinCommand("add_link_options", cmAddLinkOptionsCommand); state->AddBuiltinCommand("link_libraries", cmLinkLibrariesCommand); state->AddBuiltinCommand("target_link_directories", @@ -296,6 +295,7 @@ void GetProjectCommands(cmState* state) state->AddBuiltinCommand("qt_wrap_ui", cmQTWrapUICommand); state->AddBuiltinCommand("remove_definitions", cmRemoveDefinitionsCommand); state->AddBuiltinCommand("source_group", cmSourceGroupCommand); + state->AddBuiltinCommand("subdirs", cmSubdirCommand); state->AddBuiltinCommand("cmake_file_api", cmFileAPICommand); state->AddBuiltinCommand("cmake_instrumentation", cmInstrumentationCommand); diff --git a/bootstrap b/bootstrap index d56085b618..89bab1b743 100755 --- a/bootstrap +++ b/bootstrap @@ -405,7 +405,6 @@ CMAKE_CXX_SOURCES="\ cmInstallDirectoryGenerator \ cmInstallExportGenerator \ cmInstallFileSetGenerator \ - cmInstallFilesCommand \ cmInstallFilesGenerator \ cmInstallGenerator \ cmInstallGetRuntimeDependenciesGenerator \ @@ -416,7 +415,6 @@ CMAKE_CXX_SOURCES="\ cmInstallScriptGenerator \ cmInstallSubdirectoryGenerator \ cmInstallTargetGenerator \ - cmInstallTargetsCommand \ cmInstalledFile \ cmJSONHelpers \ cmJSONState \ @@ -433,7 +431,6 @@ CMAKE_CXX_SOURCES="\ cmLocalGenerator \ cmMSVC60LinkLineComputer \ cmMacroCommand \ - cmMakeDirectoryCommand \ cmMakefile \ cmMarkAsAdvancedCommand \ cmMathCommand \ @@ -487,7 +484,6 @@ CMAKE_CXX_SOURCES="\ cmStringReplaceHelper \ cmStringCommand \ cmSubcommandTable \ - cmSubdirCommand \ cmSystemTools \ cmTarget \ cmTargetCompileDefinitionsCommand \