From 94c1e4fdb35c01ef5ad57ed3284b20d8d7fc3496 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 21 May 2020 13:25:13 -0400 Subject: [PATCH] cmake_language: Rename command from cmake_command Also rename the `INVOKE` signature to `CALL`. Fixes: #20732 --- .../{cmake_command.rst => cmake_language.rst} | 26 +++++++++---------- Help/command/function.rst | 6 ++--- Help/command/macro.rst | 6 ++--- Help/manual/cmake-commands.7.rst | 2 +- Help/release/dev/cmake_command-command.rst | 6 ----- Help/release/dev/cmake_language-command.rst | 6 +++++ Source/CMakeLists.txt | 4 +-- ...Command.cxx => cmCMakeLanguageCommand.cxx} | 16 ++++++------ ...MakeCommand.h => cmCMakeLanguageCommand.h} | 8 +++--- Source/cmCommands.cxx | 4 +-- Tests/RunCMake/CMakeLists.txt | 3 +-- .../RunCMake/cmake_command/RunCMakeTest.cmake | 23 ---------------- ...ake_command_eval_expand_command_name.cmake | 2 -- ...arameters_between_eval_and_code-stderr.txt | 5 ---- ...tra_parameters_between_eval_and_code.cmake | 1 - .../cmake_command_eval_message.cmake | 1 - ...ommand_eval_message_fatal_error-stderr.txt | 5 ---- .../cmake_command_eval_no_code-stderr.txt | 2 -- .../cmake_command_eval_no_code.cmake | 1 - ...make_command_eval_no_parameters-stderr.txt | 2 -- .../cmake_command_eval_no_parameters.cmake | 1 - ...ommand_eval_variable_outside_message.cmake | 2 -- ...ake_command_invoke_double_evaluation.cmake | 2 -- ...e_command_invoke_expand_command_name.cmake | 2 -- ..._expanded_command_and_arguments-stderr.txt | 4 --- ...nvoke_expanded_command_and_arguments.cmake | 2 -- ...anded_command_with_explicit_argument.cmake | 2 -- .../cmake_command_invoke_message.cmake | 1 - ...mand_invoke_message_fatal_error-stderr.txt | 5 ---- ...e_command_invoke_message_fatal_error.cmake | 1 - ...ke_command_invoke_no_parameters-stderr.txt | 2 -- .../cmake_command_invoke_no_parameters.cmake | 1 - ...command_invoke_unknown_function-stderr.txt | 2 -- ...make_command_invoke_unknown_function.cmake | 1 - .../cmake_command_no_parameters-stderr.txt | 2 -- .../cmake_command_no_parameters.cmake | 1 - ..._command_unknown_meta_operation-stderr.txt | 2 -- ...cmake_command_unknown_meta_operation.cmake | 1 - .../CMakeLists.txt | 0 .../cmake_language/RunCMakeTest.cmake | 23 ++++++++++++++++ .../call_double_evaluation-stderr.txt} | 0 .../call_double_evaluation.cmake | 2 ++ .../call_expand_command_name-stderr.txt} | 0 .../call_expand_command_name.cmake | 2 ++ .../call_expand_function_name-stderr.txt} | 0 .../call_expand_function_name.cmake} | 2 +- .../call_expanded_command-stderr.txt} | 0 .../call_expanded_command.cmake} | 4 +-- ...expanded_command_and_arguments-result.txt} | 0 ..._expanded_command_and_arguments-stderr.txt | 4 +++ .../call_expanded_command_and_arguments.cmake | 2 ++ ...command_with_explicit_argument-stderr.txt} | 0 ...anded_command_with_explicit_argument.cmake | 2 ++ .../call_message-stderr.txt} | 0 .../cmake_language/call_message.cmake | 1 + .../call_message_fatal_error-result.txt} | 0 .../call_message_fatal_error-stderr.txt | 5 ++++ .../call_message_fatal_error.cmake | 1 + .../call_no_parameters-result.txt} | 0 .../call_no_parameters-stderr.txt | 2 ++ .../cmake_language/call_no_parameters.cmake | 1 + .../call_preserve_arguments-stderr.txt} | 2 +- .../call_preserve_arguments.cmake} | 4 +-- .../call_unknown_function-result.txt} | 0 .../call_unknown_function-stderr.txt | 2 ++ .../call_unknown_function.cmake | 1 + .../eval_expand_command_name-stderr.txt} | 0 .../eval_expand_command_name.cmake | 2 ++ ...expanded_command_and_arguments-stderr.txt} | 0 ...eval_expanded_command_and_arguments.cmake} | 2 +- ...rameters_between_eval_and_code-result.txt} | 0 ...arameters_between_eval_and_code-stderr.txt | 5 ++++ ...tra_parameters_between_eval_and_code.cmake | 1 + .../eval_message-stderr.txt} | 0 .../cmake_language/eval_message.cmake | 1 + .../eval_message_fatal_error-result.txt} | 0 .../eval_message_fatal_error-stderr.txt | 5 ++++ .../eval_message_fatal_error.cmake} | 2 +- .../eval_no_code-result.txt} | 0 .../cmake_language/eval_no_code-stderr.txt | 2 ++ .../cmake_language/eval_no_code.cmake | 1 + .../eval_no_parameters-result.txt} | 0 .../eval_no_parameters-stderr.txt | 2 ++ .../cmake_language/eval_no_parameters.cmake | 1 + .../eval_variable_outside_message-stderr.txt} | 0 .../eval_variable_outside_message.cmake | 2 ++ .../no_parameters-result.txt} | 0 .../cmake_language/no_parameters-stderr.txt | 2 ++ .../cmake_language/no_parameters.cmake | 1 + .../unknown_meta_operation-result.txt} | 0 .../unknown_meta_operation-stderr.txt | 2 ++ .../unknown_meta_operation.cmake | 1 + 92 files changed, 127 insertions(+), 128 deletions(-) rename Help/command/{cmake_command.rst => cmake_language.rst} (69%) delete mode 100644 Help/release/dev/cmake_command-command.rst create mode 100644 Help/release/dev/cmake_language-command.rst rename Source/{cmCMakeCommand.cxx => cmCMakeLanguageCommand.cxx} (89%) rename Source/{cmCMakeCommand.h => cmCMakeLanguageCommand.h} (63%) delete mode 100644 Tests/RunCMake/cmake_command/RunCMakeTest.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_expand_command_name.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_message.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_no_code-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_no_code.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_eval_variable_outside_message.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_double_evaluation.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_expand_command_name.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_with_explicit_argument.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_message.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_no_parameters-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_no_parameters.cmake delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation-stderr.txt delete mode 100644 Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation.cmake rename Tests/RunCMake/{cmake_command => cmake_language}/CMakeLists.txt (100%) create mode 100644 Tests/RunCMake/cmake_language/RunCMakeTest.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_double_evaluation-stderr.txt => cmake_language/call_double_evaluation-stderr.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_double_evaluation.cmake rename Tests/RunCMake/{cmake_command/cmake_command_eval_expand_command_name-stderr.txt => cmake_language/call_expand_command_name-stderr.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_expand_command_name.cmake rename Tests/RunCMake/{cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code-result.txt => cmake_language/call_expand_function_name-stderr.txt} (100%) rename Tests/RunCMake/{cmake_command/cmake_command_invoke_expand_function_name.cmake => cmake_language/call_expand_function_name.cmake} (70%) rename Tests/RunCMake/{cmake_command/cmake_command_eval_expanded_command_and_arguments-stderr.txt => cmake_language/call_expanded_command-stderr.txt} (100%) rename Tests/RunCMake/{cmake_command/cmake_command_invoke_expanded_command.cmake => cmake_language/call_expanded_command.cmake} (50%) rename Tests/RunCMake/{cmake_command/cmake_command_eval_message_fatal_error-result.txt => cmake_language/call_expanded_command_and_arguments-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_expanded_command_and_arguments-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/call_expanded_command_and_arguments.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_expand_command_name-stderr.txt => cmake_language/call_expanded_command_with_explicit_argument-stderr.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_expanded_command_with_explicit_argument.cmake rename Tests/RunCMake/{cmake_command/cmake_command_eval_message-stderr.txt => cmake_language/call_message-stderr.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_message.cmake rename Tests/RunCMake/{cmake_command/cmake_command_eval_no_code-result.txt => cmake_language/call_message_fatal_error-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_message_fatal_error-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/call_message_fatal_error.cmake rename Tests/RunCMake/{cmake_command/cmake_command_eval_no_parameters-result.txt => cmake_language/call_no_parameters-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_no_parameters-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/call_no_parameters.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_preserve_arguments-stderr.txt => cmake_language/call_preserve_arguments-stderr.txt} (57%) rename Tests/RunCMake/{cmake_command/cmake_command_invoke_preserve_arguments.cmake => cmake_language/call_preserve_arguments.cmake} (69%) rename Tests/RunCMake/{cmake_command/cmake_command_invoke_expand_function_name-stderr.txt => cmake_language/call_unknown_function-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/call_unknown_function-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/call_unknown_function.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_expanded_command-stderr.txt => cmake_language/eval_expand_command_name-stderr.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/eval_expand_command_name.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_expanded_command_with_explicit_argument-stderr.txt => cmake_language/eval_expanded_command_and_arguments-stderr.txt} (100%) rename Tests/RunCMake/{cmake_command/cmake_command_eval_expanded_command_and_arguments.cmake => cmake_language/eval_expanded_command_and_arguments.cmake} (62%) rename Tests/RunCMake/{cmake_command/cmake_command_invoke_expanded_command_and_arguments-result.txt => cmake_language/eval_extra_parameters_between_eval_and_code-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code.cmake rename Tests/RunCMake/{cmake_command/cmake_command_eval_variable_outside_message-stderr.txt => cmake_language/eval_message-stderr.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/eval_message.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_message_fatal_error-result.txt => cmake_language/eval_message_fatal_error-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/eval_message_fatal_error-stderr.txt rename Tests/RunCMake/{cmake_command/cmake_command_eval_message_fatal_error.cmake => cmake_language/eval_message_fatal_error.cmake} (59%) rename Tests/RunCMake/{cmake_command/cmake_command_invoke_no_parameters-result.txt => cmake_language/eval_no_code-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/eval_no_code-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/eval_no_code.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_unknown_function-result.txt => cmake_language/eval_no_parameters-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/eval_no_parameters-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/eval_no_parameters.cmake rename Tests/RunCMake/{cmake_command/cmake_command_invoke_message-stderr.txt => cmake_language/eval_variable_outside_message-stderr.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/eval_variable_outside_message.cmake rename Tests/RunCMake/{cmake_command/cmake_command_no_parameters-result.txt => cmake_language/no_parameters-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/no_parameters-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/no_parameters.cmake rename Tests/RunCMake/{cmake_command/cmake_command_unknown_meta_operation-result.txt => cmake_language/unknown_meta_operation-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_language/unknown_meta_operation-stderr.txt create mode 100644 Tests/RunCMake/cmake_language/unknown_meta_operation.cmake diff --git a/Help/command/cmake_command.rst b/Help/command/cmake_language.rst similarity index 69% rename from Help/command/cmake_command.rst rename to Help/command/cmake_language.rst index 08b783232d..21f51a0c77 100644 --- a/Help/command/cmake_command.rst +++ b/Help/command/cmake_language.rst @@ -1,5 +1,5 @@ -cmake_command -------------- +cmake_language +-------------- Call meta-operations on CMake commands. @@ -8,8 +8,8 @@ Synopsis .. parsed-literal:: - cmake_command(`INVOKE`_ [...]) - cmake_command(`EVAL`_ CODE ...) + cmake_language(`CALL`_ [...]) + cmake_language(`EVAL`_ CODE ...) Introduction ^^^^^^^^^^^^ @@ -17,24 +17,24 @@ Introduction This command will call meta-operations on built-in CMake commands or those created via the :command:`macro` or :command:`function` commands. -``cmake_command`` does not introduce a new variable or policy scope. +``cmake_language`` does not introduce a new variable or policy scope. -Invoking Commands -^^^^^^^^^^^^^^^^^ +Calling Commands +^^^^^^^^^^^^^^^^ -.. _INVOKE: +.. _CALL: .. code-block:: cmake - cmake_command(INVOKE [...]) + cmake_language(CALL [...]) -Invokes the named ```` with the given arguments (if any). +Calls the named ```` with the given arguments (if any). For example, the code: .. code-block:: cmake set(message_command "message") - cmake_command(INVOKE ${message_command} STATUS "Hello World!") + cmake_language(CALL ${message_command} STATUS "Hello World!") is equivalent to @@ -49,7 +49,7 @@ Evaluating Code .. code-block:: cmake - cmake_command(EVAL CODE ...) + cmake_language(EVAL CODE ...) Evaluates the ``...`` as CMake code. @@ -62,7 +62,7 @@ For example, the code: set(C TRUE) set(condition "(A AND B) OR C") - cmake_command(EVAL CODE " + cmake_language(EVAL CODE " if (${condition}) message(STATUS TRUE) else() diff --git a/Help/command/function.rst b/Help/command/function.rst index 30938b3ee1..7a9b907542 100644 --- a/Help/command/function.rst +++ b/Help/command/function.rst @@ -44,14 +44,14 @@ can be invoked through any of foo() Foo() FOO() - cmake_command(INVOKE foo) + cmake_language(CALL foo) and so on. However, it is strongly recommended to stay with the case chosen in the function definition. Typically functions use all-lowercase names. -The :command:`cmake_command(INVOKE ...)` command can also be used to invoke the -function. +The :command:`cmake_language(CALL ...)` command can also be used to +invoke the function. Arguments ^^^^^^^^^ diff --git a/Help/command/macro.rst b/Help/command/macro.rst index 65159f43b2..797a90d8f4 100644 --- a/Help/command/macro.rst +++ b/Help/command/macro.rst @@ -42,14 +42,14 @@ can be invoked through any of foo() Foo() FOO() - cmake_command(INVOKE foo) + cmake_language(CALL foo) and so on. However, it is strongly recommended to stay with the case chosen in the macro definition. Typically macros use all-lowercase names. -The :command:`cmake_command(INVOKE ...)` command can also be used to invoke the -macro. +The :command:`cmake_language(CALL ...)` command can also be used to +invoke the macro. Arguments ^^^^^^^^^ diff --git a/Help/manual/cmake-commands.7.rst b/Help/manual/cmake-commands.7.rst index 87743b4b75..0aa4f75177 100644 --- a/Help/manual/cmake-commands.7.rst +++ b/Help/manual/cmake-commands.7.rst @@ -16,8 +16,8 @@ These commands are always available. :maxdepth: 1 /command/break - /command/cmake_command /command/cmake_host_system_information + /command/cmake_language /command/cmake_minimum_required /command/cmake_parse_arguments /command/cmake_policy diff --git a/Help/release/dev/cmake_command-command.rst b/Help/release/dev/cmake_command-command.rst deleted file mode 100644 index 6200ae20e3..0000000000 --- a/Help/release/dev/cmake_command-command.rst +++ /dev/null @@ -1,6 +0,0 @@ -cmake_command -------------- - -* The :command:`cmake_command()` command was added for meta-operations on - scripted or built-in commands, starting with a mode to ``INVOKE`` other - commands, and ``EVAL CODE`` to inplace evaluate a CMake script. diff --git a/Help/release/dev/cmake_language-command.rst b/Help/release/dev/cmake_language-command.rst new file mode 100644 index 0000000000..5c00cea442 --- /dev/null +++ b/Help/release/dev/cmake_language-command.rst @@ -0,0 +1,6 @@ +cmake_language-command +---------------------- + +* The :command:`cmake_language()` command was added for meta-operations on + scripted or built-in commands, starting with a mode to ``CALL`` other + commands, and ``EVAL CODE`` to inplace evaluate a CMake script. diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 6d585eed7d..22d8032e2a 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -488,10 +488,10 @@ set(SRCS cmBuildCommand.h cmBuildNameCommand.cxx cmBuildNameCommand.h - cmCMakeCommand.cxx - cmCMakeCommand.h cmCMakeHostSystemInformationCommand.cxx cmCMakeHostSystemInformationCommand.h + cmCMakeLanguageCommand.cxx + cmCMakeLanguageCommand.h cmCMakeMinimumRequired.cxx cmCMakeMinimumRequired.h cmCMakePolicyCommand.cxx diff --git a/Source/cmCMakeCommand.cxx b/Source/cmCMakeLanguageCommand.cxx similarity index 89% rename from Source/cmCMakeCommand.cxx rename to Source/cmCMakeLanguageCommand.cxx index 23bc0eac9a..66857be450 100644 --- a/Source/cmCMakeCommand.cxx +++ b/Source/cmCMakeLanguageCommand.cxx @@ -1,6 +1,6 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmCMakeCommand.h" +#include "cmCMakeLanguageCommand.h" #include #include @@ -13,8 +13,8 @@ #include "cmRange.h" #include "cmStringAlgorithms.h" -bool cmCMakeCommand(std::vector const& args, - cmExecutionStatus& status) +bool cmCMakeLanguageCommand(std::vector const& args, + cmExecutionStatus& status) { if (args.empty()) { status.SetError("called with incorrect number of arguments"); @@ -36,7 +36,7 @@ bool cmCMakeCommand(std::vector const& args, return false; } - if (dispatchExpandedArgs[0] == "INVOKE") { + if (dispatchExpandedArgs[0] == "CALL") { if ((args.size() == 1 && dispatchExpandedArgs.size() != 2) || dispatchExpandedArgs.size() > 2) { status.SetError("called with incorrect number of arguments"); @@ -44,7 +44,7 @@ bool cmCMakeCommand(std::vector const& args, } // First argument is the name of the function to call - std::string invokeCommand; + std::string callCommand; size_t startArg; if (dispatchExpandedArgs.size() == 1) { std::vector functionExpandedArg; @@ -57,15 +57,15 @@ bool cmCMakeCommand(std::vector const& args, return false; } - invokeCommand = functionExpandedArg[0]; + callCommand = functionExpandedArg[0]; startArg = 2; } else { - invokeCommand = dispatchExpandedArgs[1]; + callCommand = dispatchExpandedArgs[1]; startArg = 1; } cmListFileFunction func; - func.Name = invokeCommand; + func.Name = callCommand; func.Line = context.Line; // The rest of the arguments are passed to the function call above diff --git a/Source/cmCMakeCommand.h b/Source/cmCMakeLanguageCommand.h similarity index 63% rename from Source/cmCMakeCommand.h rename to Source/cmCMakeLanguageCommand.h index 7dbecff9ee..73065156b0 100644 --- a/Source/cmCMakeCommand.h +++ b/Source/cmCMakeLanguageCommand.h @@ -1,7 +1,7 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cmCMakeCommand_h -#define cmCMakeCommand_h +#ifndef cmCMakeLanguageCommand_h +#define cmCMakeLanguageCommand_h #include "cmConfigure.h" // IWYU pragma: keep @@ -14,7 +14,7 @@ struct cmListFileArgument; * \brief Calls a scripted or build-in command * */ -bool cmCMakeCommand(std::vector const& args, - cmExecutionStatus& status); +bool cmCMakeLanguageCommand(std::vector const& args, + cmExecutionStatus& status); #endif diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index 28b426732c..c94f128869 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -91,8 +91,8 @@ # include "cmAddLinkOptionsCommand.h" # include "cmAuxSourceDirectoryCommand.h" # include "cmBuildNameCommand.h" -# include "cmCMakeCommand.h" # include "cmCMakeHostSystemInformationCommand.h" +# include "cmCMakeLanguageCommand.h" # include "cmExportCommand.h" # include "cmExportLibraryDependenciesCommand.h" # include "cmFLTKWrapUICommand.h" @@ -197,9 +197,9 @@ void GetScriptingCommands(cmState* state) "match the opening WHILE command."); #if !defined(CMAKE_BOOTSTRAP) - state->AddBuiltinCommand("cmake_command", cmCMakeCommand); 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/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 230f168480..0f94e4e007 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -281,6 +281,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) endif() add_RunCMake_test(execute_process) add_RunCMake_test(export) +add_RunCMake_test(cmake_language) add_RunCMake_test(cmake_minimum_required) add_RunCMake_test(cmake_parse_arguments) add_RunCMake_test(continue) @@ -676,5 +677,3 @@ add_RunCMake_test("CTestCommandExpandLists") add_RunCMake_test(PrecompileHeaders -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}) add_RunCMake_test("UnityBuild") - -add_RunCMake_test(cmake_command) diff --git a/Tests/RunCMake/cmake_command/RunCMakeTest.cmake b/Tests/RunCMake/cmake_command/RunCMakeTest.cmake deleted file mode 100644 index a6b2efe7cb..0000000000 --- a/Tests/RunCMake/cmake_command/RunCMakeTest.cmake +++ /dev/null @@ -1,23 +0,0 @@ -include(RunCMake) - -run_cmake(cmake_command_no_parameters) -run_cmake(cmake_command_unknown_meta_operation) -run_cmake(cmake_command_invoke_double_evaluation) -run_cmake(cmake_command_invoke_expanded_command) -run_cmake(cmake_command_invoke_expanded_command_and_arguments) -run_cmake(cmake_command_invoke_expanded_command_with_explicit_argument) -run_cmake(cmake_command_invoke_expand_command_name) -run_cmake(cmake_command_invoke_expand_function_name) -run_cmake(cmake_command_invoke_message) -run_cmake(cmake_command_invoke_message_fatal_error) -run_cmake(cmake_command_invoke_no_parameters) -run_cmake(cmake_command_invoke_preserve_arguments) -run_cmake(cmake_command_invoke_unknown_function) -run_cmake(cmake_command_eval_expand_command_name) -run_cmake(cmake_command_eval_expanded_command_and_arguments) -run_cmake(cmake_command_eval_extra_parameters_between_eval_and_code) -run_cmake(cmake_command_eval_message) -run_cmake(cmake_command_eval_message_fatal_error) -run_cmake(cmake_command_eval_no_code) -run_cmake(cmake_command_eval_no_parameters) -run_cmake(cmake_command_eval_variable_outside_message) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_expand_command_name.cmake b/Tests/RunCMake/cmake_command/cmake_command_eval_expand_command_name.cmake deleted file mode 100644 index 4cea3930b2..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_expand_command_name.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set (my_eval "EVAL") -cmake_command (${my_eval} CODE message("OK!")) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code-stderr.txt deleted file mode 100644 index 13c114ed88..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMake Error at cmake_command_eval_extra_parameters_between_eval_and_code.cmake:1 \(cmake_command\): - cmake_command called with unsupported arguments between EVAL and CODE - arguments -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code.cmake b/Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code.cmake deleted file mode 100644 index 0927631f8d..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(EVAL BAD CODE "message(BAD CODE)") diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_message.cmake b/Tests/RunCMake/cmake_command/cmake_command_eval_message.cmake deleted file mode 100644 index 9ef5e25daf..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_message.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(EVAL CODE message(WORKS!)) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error-stderr.txt deleted file mode 100644 index 6a8a124592..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMake Error at cmake_command_eval_message_fatal_error.cmake:1:EVAL:2 \(message\): - error! -Call Stack \(most recent call first\): - cmake_command_eval_message_fatal_error.cmake:1 \(cmake_command\) - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_no_code-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_eval_no_code-stderr.txt deleted file mode 100644 index ee53312ecf..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_no_code-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at cmake_command_eval_no_code.cmake:1 \(cmake_command\): - cmake_command called without CODE argument diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_no_code.cmake b/Tests/RunCMake/cmake_command/cmake_command_eval_no_code.cmake deleted file mode 100644 index 22e166753d..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_no_code.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(EVAL message "too many parameters") diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters-stderr.txt deleted file mode 100644 index e9fc317e59..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at cmake_command_eval_no_parameters.cmake:1 \(cmake_command\): - cmake_command called with incorrect number of arguments diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters.cmake b/Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters.cmake deleted file mode 100644 index a5ba2c7d98..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(EVAL) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_variable_outside_message.cmake b/Tests/RunCMake/cmake_command/cmake_command_eval_variable_outside_message.cmake deleted file mode 100644 index b7a06a518b..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_variable_outside_message.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_command(EVAL CODE "set(phrase \"WORKS!\")") -message(${phrase}) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_double_evaluation.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_double_evaluation.cmake deleted file mode 100644 index 10970fc229..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_double_evaluation.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(var [[${foo}]]) -cmake_command(INVOKE cmake_command INVOKE message "var='${var}'") diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expand_command_name.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_expand_command_name.cmake deleted file mode 100644 index d59afe4d62..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_expand_command_name.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set (my_invoke "INVOKE") -cmake_command (${my_invoke} message "OK!") diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments-stderr.txt deleted file mode 100644 index 6d0e241b37..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments-stderr.txt +++ /dev/null @@ -1,4 +0,0 @@ -CMake Error at cmake_command_invoke_expanded_command_and_arguments.cmake:2 \(cmake_command\): - cmake_command called with incorrect number of arguments -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments.cmake deleted file mode 100644 index 6bfa3a7245..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(invoke_message INVOKE message a b) -cmake_command(${invoke_message}) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_with_explicit_argument.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_with_explicit_argument.cmake deleted file mode 100644 index eb0411f5a5..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_with_explicit_argument.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set (cmd INVOKE message) -cmake_command (${cmd} "OK!") diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_message.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_message.cmake deleted file mode 100644 index 336d78a835..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_message.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(INVOKE message WORKS!) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error-stderr.txt deleted file mode 100644 index 2c9dab5565..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMake Error at cmake_command_invoke_message_fatal_error.cmake:1 \(message\): - error! -Call Stack \(most recent call first\): - cmake_command_invoke_message_fatal_error.cmake:1 \(cmake_command\) - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error.cmake deleted file mode 100644 index 6b427647b8..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(INVOKE message FATAL_ERROR error!) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters-stderr.txt deleted file mode 100644 index 7741b41713..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at cmake_command_invoke_no_parameters.cmake:1 \(cmake_command\): - cmake_command called with incorrect number of arguments diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters.cmake deleted file mode 100644 index b9c5e14c57..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(INVOKE) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function-stderr.txt deleted file mode 100644 index 50a81a3c0b..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at cmake_command_invoke_unknown_function.cmake:1 \(unknown\): - Unknown CMake command "unknown". diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function.cmake b/Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function.cmake deleted file mode 100644 index f19a04b3ab..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(INVOKE unknown) diff --git a/Tests/RunCMake/cmake_command/cmake_command_no_parameters-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_no_parameters-stderr.txt deleted file mode 100644 index 772b604755..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_no_parameters-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at cmake_command_no_parameters.cmake:1 \(cmake_command\): - cmake_command called with incorrect number of arguments diff --git a/Tests/RunCMake/cmake_command/cmake_command_no_parameters.cmake b/Tests/RunCMake/cmake_command/cmake_command_no_parameters.cmake deleted file mode 100644 index b9c5e14c57..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_no_parameters.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(INVOKE) diff --git a/Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation-stderr.txt b/Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation-stderr.txt deleted file mode 100644 index 7b9b9153ad..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at cmake_command_unknown_meta_operation.cmake:1 \(cmake_command\): - cmake_command called with unknown meta-operation diff --git a/Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation.cmake b/Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation.cmake deleted file mode 100644 index f7c77e5e08..0000000000 --- a/Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_command(UNKNOWN) diff --git a/Tests/RunCMake/cmake_command/CMakeLists.txt b/Tests/RunCMake/cmake_language/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/cmake_command/CMakeLists.txt rename to Tests/RunCMake/cmake_language/CMakeLists.txt diff --git a/Tests/RunCMake/cmake_language/RunCMakeTest.cmake b/Tests/RunCMake/cmake_language/RunCMakeTest.cmake new file mode 100644 index 0000000000..c556e42012 --- /dev/null +++ b/Tests/RunCMake/cmake_language/RunCMakeTest.cmake @@ -0,0 +1,23 @@ +include(RunCMake) + +run_cmake(no_parameters) +run_cmake(unknown_meta_operation) +run_cmake(call_double_evaluation) +run_cmake(call_expanded_command) +run_cmake(call_expanded_command_and_arguments) +run_cmake(call_expanded_command_with_explicit_argument) +run_cmake(call_expand_command_name) +run_cmake(call_expand_function_name) +run_cmake(call_message) +run_cmake(call_message_fatal_error) +run_cmake(call_no_parameters) +run_cmake(call_preserve_arguments) +run_cmake(call_unknown_function) +run_cmake(eval_expand_command_name) +run_cmake(eval_expanded_command_and_arguments) +run_cmake(eval_extra_parameters_between_eval_and_code) +run_cmake(eval_message) +run_cmake(eval_message_fatal_error) +run_cmake(eval_no_code) +run_cmake(eval_no_parameters) +run_cmake(eval_variable_outside_message) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_double_evaluation-stderr.txt b/Tests/RunCMake/cmake_language/call_double_evaluation-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_double_evaluation-stderr.txt rename to Tests/RunCMake/cmake_language/call_double_evaluation-stderr.txt diff --git a/Tests/RunCMake/cmake_language/call_double_evaluation.cmake b/Tests/RunCMake/cmake_language/call_double_evaluation.cmake new file mode 100644 index 0000000000..cf8fc914c0 --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_double_evaluation.cmake @@ -0,0 +1,2 @@ +set(var [[${foo}]]) +cmake_language(CALL cmake_language CALL message "var='${var}'") diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_expand_command_name-stderr.txt b/Tests/RunCMake/cmake_language/call_expand_command_name-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_expand_command_name-stderr.txt rename to Tests/RunCMake/cmake_language/call_expand_command_name-stderr.txt diff --git a/Tests/RunCMake/cmake_language/call_expand_command_name.cmake b/Tests/RunCMake/cmake_language/call_expand_command_name.cmake new file mode 100644 index 0000000000..e03bb1fd27 --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_expand_command_name.cmake @@ -0,0 +1,2 @@ +set (my_call "CALL") +cmake_language (${my_call} message "OK!") diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code-result.txt b/Tests/RunCMake/cmake_language/call_expand_function_name-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_extra_parameters_between_eval_and_code-result.txt rename to Tests/RunCMake/cmake_language/call_expand_function_name-stderr.txt diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expand_function_name.cmake b/Tests/RunCMake/cmake_language/call_expand_function_name.cmake similarity index 70% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_expand_function_name.cmake rename to Tests/RunCMake/cmake_language/call_expand_function_name.cmake index 923ddaaa94..565a7df406 100644 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_expand_function_name.cmake +++ b/Tests/RunCMake/cmake_language/call_expand_function_name.cmake @@ -8,4 +8,4 @@ endfunction() set(function_version 1) -cmake_command(INVOKE some_function_${function_version}) +cmake_language(CALL some_function_${function_version}) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_expanded_command_and_arguments-stderr.txt b/Tests/RunCMake/cmake_language/call_expanded_command-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_expanded_command_and_arguments-stderr.txt rename to Tests/RunCMake/cmake_language/call_expanded_command-stderr.txt diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command.cmake b/Tests/RunCMake/cmake_language/call_expanded_command.cmake similarity index 50% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command.cmake rename to Tests/RunCMake/cmake_language/call_expanded_command.cmake index bca7d2f91f..e76e612319 100644 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command.cmake +++ b/Tests/RunCMake/cmake_language/call_expanded_command.cmake @@ -2,5 +2,5 @@ function (itsok) message(OK!) endfunction() -set (cmd INVOKE itsok) -cmake_command (${cmd}) +set (cmd CALL itsok) +cmake_language (${cmd}) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error-result.txt b/Tests/RunCMake/cmake_language/call_expanded_command_and_arguments-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error-result.txt rename to Tests/RunCMake/cmake_language/call_expanded_command_and_arguments-result.txt diff --git a/Tests/RunCMake/cmake_language/call_expanded_command_and_arguments-stderr.txt b/Tests/RunCMake/cmake_language/call_expanded_command_and_arguments-stderr.txt new file mode 100644 index 0000000000..e87e9bc272 --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_expanded_command_and_arguments-stderr.txt @@ -0,0 +1,4 @@ +CMake Error at call_expanded_command_and_arguments.cmake:2 \(cmake_language\): + cmake_language called with incorrect number of arguments +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_language/call_expanded_command_and_arguments.cmake b/Tests/RunCMake/cmake_language/call_expanded_command_and_arguments.cmake new file mode 100644 index 0000000000..4ce6b34dea --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_expanded_command_and_arguments.cmake @@ -0,0 +1,2 @@ +set(call_message CALL message a b) +cmake_language(${call_message}) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expand_command_name-stderr.txt b/Tests/RunCMake/cmake_language/call_expanded_command_with_explicit_argument-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_expand_command_name-stderr.txt rename to Tests/RunCMake/cmake_language/call_expanded_command_with_explicit_argument-stderr.txt diff --git a/Tests/RunCMake/cmake_language/call_expanded_command_with_explicit_argument.cmake b/Tests/RunCMake/cmake_language/call_expanded_command_with_explicit_argument.cmake new file mode 100644 index 0000000000..0563400055 --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_expanded_command_with_explicit_argument.cmake @@ -0,0 +1,2 @@ +set (cmd CALL message) +cmake_language (${cmd} "OK!") diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_message-stderr.txt b/Tests/RunCMake/cmake_language/call_message-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_message-stderr.txt rename to Tests/RunCMake/cmake_language/call_message-stderr.txt diff --git a/Tests/RunCMake/cmake_language/call_message.cmake b/Tests/RunCMake/cmake_language/call_message.cmake new file mode 100644 index 0000000000..31aefdf210 --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_message.cmake @@ -0,0 +1 @@ +cmake_language(CALL message WORKS!) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_no_code-result.txt b/Tests/RunCMake/cmake_language/call_message_fatal_error-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_no_code-result.txt rename to Tests/RunCMake/cmake_language/call_message_fatal_error-result.txt diff --git a/Tests/RunCMake/cmake_language/call_message_fatal_error-stderr.txt b/Tests/RunCMake/cmake_language/call_message_fatal_error-stderr.txt new file mode 100644 index 0000000000..83eb3d80af --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_message_fatal_error-stderr.txt @@ -0,0 +1,5 @@ +CMake Error at call_message_fatal_error.cmake:1 \(message\): + error! +Call Stack \(most recent call first\): + call_message_fatal_error.cmake:1 \(cmake_language\) + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_language/call_message_fatal_error.cmake b/Tests/RunCMake/cmake_language/call_message_fatal_error.cmake new file mode 100644 index 0000000000..935b43794f --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_message_fatal_error.cmake @@ -0,0 +1 @@ +cmake_language(CALL message FATAL_ERROR error!) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters-result.txt b/Tests/RunCMake/cmake_language/call_no_parameters-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_no_parameters-result.txt rename to Tests/RunCMake/cmake_language/call_no_parameters-result.txt diff --git a/Tests/RunCMake/cmake_language/call_no_parameters-stderr.txt b/Tests/RunCMake/cmake_language/call_no_parameters-stderr.txt new file mode 100644 index 0000000000..9e2c08fd7f --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_no_parameters-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at call_no_parameters.cmake:1 \(cmake_language\): + cmake_language called with incorrect number of arguments diff --git a/Tests/RunCMake/cmake_language/call_no_parameters.cmake b/Tests/RunCMake/cmake_language/call_no_parameters.cmake new file mode 100644 index 0000000000..8353e08da7 --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_no_parameters.cmake @@ -0,0 +1 @@ +cmake_language(CALL) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_preserve_arguments-stderr.txt b/Tests/RunCMake/cmake_language/call_preserve_arguments-stderr.txt similarity index 57% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_preserve_arguments-stderr.txt rename to Tests/RunCMake/cmake_language/call_preserve_arguments-stderr.txt index 4670e60b0c..8ec5483cd6 100644 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_preserve_arguments-stderr.txt +++ b/Tests/RunCMake/cmake_language/call_preserve_arguments-stderr.txt @@ -1,6 +1,6 @@ foo\(...\) \[a;b\] \[c;d\] -cmake_command\(INVOKE foo ...\) +cmake_language\(CALL foo ...\) \[a;b\] \[c;d\] diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_preserve_arguments.cmake b/Tests/RunCMake/cmake_language/call_preserve_arguments.cmake similarity index 69% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_preserve_arguments.cmake rename to Tests/RunCMake/cmake_language/call_preserve_arguments.cmake index 53ac2e60e7..bfef0fda1b 100644 --- a/Tests/RunCMake/cmake_command/cmake_command_invoke_preserve_arguments.cmake +++ b/Tests/RunCMake/cmake_language/call_preserve_arguments.cmake @@ -8,5 +8,5 @@ endfunction() message("foo(...)") foo("a;b" "c;d") -message("cmake_command(INVOKE foo ...)") -cmake_command(INVOKE foo "a;b" "c;d") +message("cmake_language(CALL foo ...)") +cmake_language(CALL foo "a;b" "c;d") diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expand_function_name-stderr.txt b/Tests/RunCMake/cmake_language/call_unknown_function-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_expand_function_name-stderr.txt rename to Tests/RunCMake/cmake_language/call_unknown_function-result.txt diff --git a/Tests/RunCMake/cmake_language/call_unknown_function-stderr.txt b/Tests/RunCMake/cmake_language/call_unknown_function-stderr.txt new file mode 100644 index 0000000000..d09e708ded --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_unknown_function-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at call_unknown_function.cmake:1 \(unknown\): + Unknown CMake command "unknown". diff --git a/Tests/RunCMake/cmake_language/call_unknown_function.cmake b/Tests/RunCMake/cmake_language/call_unknown_function.cmake new file mode 100644 index 0000000000..efd6bafe9b --- /dev/null +++ b/Tests/RunCMake/cmake_language/call_unknown_function.cmake @@ -0,0 +1 @@ +cmake_language(CALL unknown) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command-stderr.txt b/Tests/RunCMake/cmake_language/eval_expand_command_name-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command-stderr.txt rename to Tests/RunCMake/cmake_language/eval_expand_command_name-stderr.txt diff --git a/Tests/RunCMake/cmake_language/eval_expand_command_name.cmake b/Tests/RunCMake/cmake_language/eval_expand_command_name.cmake new file mode 100644 index 0000000000..2397232c1c --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_expand_command_name.cmake @@ -0,0 +1,2 @@ +set (my_eval "EVAL") +cmake_language (${my_eval} CODE message("OK!")) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_with_explicit_argument-stderr.txt b/Tests/RunCMake/cmake_language/eval_expanded_command_and_arguments-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_with_explicit_argument-stderr.txt rename to Tests/RunCMake/cmake_language/eval_expanded_command_and_arguments-stderr.txt diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_expanded_command_and_arguments.cmake b/Tests/RunCMake/cmake_language/eval_expanded_command_and_arguments.cmake similarity index 62% rename from Tests/RunCMake/cmake_command/cmake_command_eval_expanded_command_and_arguments.cmake rename to Tests/RunCMake/cmake_language/eval_expanded_command_and_arguments.cmake index fcc399bbf9..f7d2d515a6 100644 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_expanded_command_and_arguments.cmake +++ b/Tests/RunCMake/cmake_language/eval_expanded_command_and_arguments.cmake @@ -1,2 +1,2 @@ set(cmd EVAL CODE [[message("OK!")]]) -cmake_command(${cmd}) +cmake_language(${cmd}) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments-result.txt b/Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_expanded_command_and_arguments-result.txt rename to Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code-result.txt diff --git a/Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code-stderr.txt b/Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code-stderr.txt new file mode 100644 index 0000000000..d32054fc8d --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code-stderr.txt @@ -0,0 +1,5 @@ +CMake Error at eval_extra_parameters_between_eval_and_code.cmake:1 \(cmake_language\): + cmake_language called with unsupported arguments between EVAL and CODE + arguments +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code.cmake b/Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code.cmake new file mode 100644 index 0000000000..7c004d7cff --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_extra_parameters_between_eval_and_code.cmake @@ -0,0 +1 @@ +cmake_language(EVAL BAD CODE "message(BAD CODE)") diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_variable_outside_message-stderr.txt b/Tests/RunCMake/cmake_language/eval_message-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_eval_variable_outside_message-stderr.txt rename to Tests/RunCMake/cmake_language/eval_message-stderr.txt diff --git a/Tests/RunCMake/cmake_language/eval_message.cmake b/Tests/RunCMake/cmake_language/eval_message.cmake new file mode 100644 index 0000000000..91edcdda61 --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_message.cmake @@ -0,0 +1 @@ +cmake_language(EVAL CODE message(WORKS!)) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error-result.txt b/Tests/RunCMake/cmake_language/eval_message_fatal_error-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_message_fatal_error-result.txt rename to Tests/RunCMake/cmake_language/eval_message_fatal_error-result.txt diff --git a/Tests/RunCMake/cmake_language/eval_message_fatal_error-stderr.txt b/Tests/RunCMake/cmake_language/eval_message_fatal_error-stderr.txt new file mode 100644 index 0000000000..5cf11e37c1 --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_message_fatal_error-stderr.txt @@ -0,0 +1,5 @@ +CMake Error at eval_message_fatal_error.cmake:1:EVAL:2 \(message\): + error! +Call Stack \(most recent call first\): + eval_message_fatal_error.cmake:1 \(cmake_language\) + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error.cmake b/Tests/RunCMake/cmake_language/eval_message_fatal_error.cmake similarity index 59% rename from Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error.cmake rename to Tests/RunCMake/cmake_language/eval_message_fatal_error.cmake index 22913de41a..72e155d06c 100644 --- a/Tests/RunCMake/cmake_command/cmake_command_eval_message_fatal_error.cmake +++ b/Tests/RunCMake/cmake_language/eval_message_fatal_error.cmake @@ -1,4 +1,4 @@ -cmake_command(EVAL CODE +cmake_language(EVAL CODE " message(FATAL_ERROR error!) " diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters-result.txt b/Tests/RunCMake/cmake_language/eval_no_code-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_no_parameters-result.txt rename to Tests/RunCMake/cmake_language/eval_no_code-result.txt diff --git a/Tests/RunCMake/cmake_language/eval_no_code-stderr.txt b/Tests/RunCMake/cmake_language/eval_no_code-stderr.txt new file mode 100644 index 0000000000..608ba8866a --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_no_code-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at eval_no_code.cmake:1 \(cmake_language\): + cmake_language called without CODE argument diff --git a/Tests/RunCMake/cmake_language/eval_no_code.cmake b/Tests/RunCMake/cmake_language/eval_no_code.cmake new file mode 100644 index 0000000000..7f5bc21a21 --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_no_code.cmake @@ -0,0 +1 @@ +cmake_language(EVAL message "too many parameters") diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function-result.txt b/Tests/RunCMake/cmake_language/eval_no_parameters-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_unknown_function-result.txt rename to Tests/RunCMake/cmake_language/eval_no_parameters-result.txt diff --git a/Tests/RunCMake/cmake_language/eval_no_parameters-stderr.txt b/Tests/RunCMake/cmake_language/eval_no_parameters-stderr.txt new file mode 100644 index 0000000000..6166898717 --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_no_parameters-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at eval_no_parameters.cmake:1 \(cmake_language\): + cmake_language called with incorrect number of arguments diff --git a/Tests/RunCMake/cmake_language/eval_no_parameters.cmake b/Tests/RunCMake/cmake_language/eval_no_parameters.cmake new file mode 100644 index 0000000000..e7ae808e24 --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_no_parameters.cmake @@ -0,0 +1 @@ +cmake_language(EVAL) diff --git a/Tests/RunCMake/cmake_command/cmake_command_invoke_message-stderr.txt b/Tests/RunCMake/cmake_language/eval_variable_outside_message-stderr.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_invoke_message-stderr.txt rename to Tests/RunCMake/cmake_language/eval_variable_outside_message-stderr.txt diff --git a/Tests/RunCMake/cmake_language/eval_variable_outside_message.cmake b/Tests/RunCMake/cmake_language/eval_variable_outside_message.cmake new file mode 100644 index 0000000000..71f0457018 --- /dev/null +++ b/Tests/RunCMake/cmake_language/eval_variable_outside_message.cmake @@ -0,0 +1,2 @@ +cmake_language(EVAL CODE "set(phrase \"WORKS!\")") +message(${phrase}) diff --git a/Tests/RunCMake/cmake_command/cmake_command_no_parameters-result.txt b/Tests/RunCMake/cmake_language/no_parameters-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_no_parameters-result.txt rename to Tests/RunCMake/cmake_language/no_parameters-result.txt diff --git a/Tests/RunCMake/cmake_language/no_parameters-stderr.txt b/Tests/RunCMake/cmake_language/no_parameters-stderr.txt new file mode 100644 index 0000000000..194bbe355a --- /dev/null +++ b/Tests/RunCMake/cmake_language/no_parameters-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at no_parameters.cmake:1 \(cmake_language\): + cmake_language called with incorrect number of arguments diff --git a/Tests/RunCMake/cmake_language/no_parameters.cmake b/Tests/RunCMake/cmake_language/no_parameters.cmake new file mode 100644 index 0000000000..8353e08da7 --- /dev/null +++ b/Tests/RunCMake/cmake_language/no_parameters.cmake @@ -0,0 +1 @@ +cmake_language(CALL) diff --git a/Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation-result.txt b/Tests/RunCMake/cmake_language/unknown_meta_operation-result.txt similarity index 100% rename from Tests/RunCMake/cmake_command/cmake_command_unknown_meta_operation-result.txt rename to Tests/RunCMake/cmake_language/unknown_meta_operation-result.txt diff --git a/Tests/RunCMake/cmake_language/unknown_meta_operation-stderr.txt b/Tests/RunCMake/cmake_language/unknown_meta_operation-stderr.txt new file mode 100644 index 0000000000..6a1d4fdf9d --- /dev/null +++ b/Tests/RunCMake/cmake_language/unknown_meta_operation-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at unknown_meta_operation.cmake:1 \(cmake_language\): + cmake_language called with unknown meta-operation diff --git a/Tests/RunCMake/cmake_language/unknown_meta_operation.cmake b/Tests/RunCMake/cmake_language/unknown_meta_operation.cmake new file mode 100644 index 0000000000..699f36f15a --- /dev/null +++ b/Tests/RunCMake/cmake_language/unknown_meta_operation.cmake @@ -0,0 +1 @@ +cmake_language(UNKNOWN)