Explorar el Código

messages: remove screamake from comments and errors

Ben Boeckel hace 3 años
padre
commit
64ea1a272c

+ 2 - 2
Source/cmEnableTestingCommand.h

@@ -14,10 +14,10 @@ class cmExecutionStatus;
  *
  * Produce the output testfile. This produces a file in the build directory
  * called CMakeTestfile with a syntax similar to CMakeLists.txt.  It contains
- * the SUBDIRS() and ADD_TEST() commands from the source CMakeLists.txt
+ * the subdirs() and add_test() commands from the source CMakeLists.txt
  * file with CMake variables expanded.  Only the subdirs and tests
  * within the valid control structures are replicated in Testfile
- * (i.e. SUBDIRS() and ADD_TEST() commands within IF() commands that are
+ * (i.e. subdirs() and add_test() commands within IF() commands that are
  * not entered by CMake are not replicated in Testfile).
  * Note that CTest expects to find this file in the build directory root;
  * therefore, this command should be in the source directory root too.

+ 1 - 1
Source/cmExportBuildAndroidMKGenerator.h

@@ -20,7 +20,7 @@ class cmGeneratorTarget;
  * a build tree.  This exports the targets to the Android ndk build tool
  * makefile format for prebuilt libraries.
  *
- * This is used to implement the EXPORT() command.
+ * This is used to implement the export() command.
  */
 class cmExportBuildAndroidMKGenerator : public cmExportBuildFileGenerator
 {

+ 1 - 1
Source/cmExportBuildFileGenerator.h

@@ -28,7 +28,7 @@ class cmTargetExport;
  * a build tree.  A single file exports information for all
  * configurations built.
  *
- * This is used to implement the EXPORT() command.
+ * This is used to implement the export() command.
  */
 class cmExportBuildFileGenerator : public cmExportFileGenerator
 {

+ 1 - 1
Source/cmTryCompileCommand.cxx

@@ -20,7 +20,7 @@ bool cmTryCompileCommand::InitialPass(std::vector<std::string> const& argv,
       cmake::FIND_PACKAGE_MODE) {
     this->Makefile->IssueMessage(
       MessageType::FATAL_ERROR,
-      "The TRY_COMPILE() command is not supported in --find-package mode.");
+      "The try_compile() command is not supported in --find-package mode.");
     return false;
   }
 

+ 10 - 10
Source/cmTryRunCommand.cxx

@@ -31,7 +31,7 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv,
       cmake::FIND_PACKAGE_MODE) {
     this->Makefile->IssueMessage(
       MessageType::FATAL_ERROR,
-      "The TRY_RUN() command is not supported in --find-package mode.");
+      "The try_run() command is not supported in --find-package mode.");
     return false;
   }
 
@@ -217,7 +217,7 @@ void cmTryRunCommand::RunExecutable(const std::string& runArgs,
     retStr = "FAILED_TO_RUN";
   }
   this->Makefile->AddCacheDefinition(this->RunResultVariable, retStr,
-                                     "Result of TRY_RUN",
+                                     "Result of try_run()",
                                      cmStateEnums::INTERNAL);
 }
 
@@ -230,7 +230,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
                                          std::string* out)
 {
   // copy the executable out of the CMakeFiles/ directory, so it is not
-  // removed at the end of TRY_RUN and the user can run it manually
+  // removed at the end of try_run() and the user can run it manually
   // on the target platform.
   std::string copyDest =
     cmStrCat(this->Makefile->GetHomeOutputDirectory(), "/CMakeFiles/",
@@ -252,7 +252,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
     // if the variables doesn't exist, create it with a helpful error text
     // and mark it as advanced
     std::string comment =
-      cmStrCat("Run result of TRY_RUN(), indicates whether the executable "
+      cmStrCat("Run result of try_run(), indicates whether the executable "
                "would have been able to run on its target platform.\n",
                detailsString);
     this->Makefile->AddCacheDefinition(this->RunResultVariable,
@@ -274,7 +274,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
       // if the variables doesn't exist, create it with a helpful error text
       // and mark it as advanced
       std::string comment = cmStrCat(
-        "Output of TRY_RUN(), contains the text, which the executable "
+        "Output of try_run(), contains the text, which the executable "
         "would have printed on stdout and stderr on its target platform.\n",
         detailsString);
 
@@ -299,7 +299,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
       if (firstTryRun) {
         /* clang-format off */
         file << "# This file was generated by CMake because it detected "
-                "TRY_RUN() commands\n"
+                "try_run() commands\n"
                 "# in crosscompiling mode. It will be overwritten by the next "
                 "CMake run.\n"
                 "# Copy it to a safe location, set the variables to "
@@ -332,7 +332,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
       }
       comment += "The ";
       comment += this->CompileResultVariable;
-      comment += " variable holds the build result for this TRY_RUN().\n\n"
+      comment += " variable holds the build result for this try_run().\n\n"
                  "Source file   : ";
       comment += srcFile + "\n";
       comment += "Executable    : ";
@@ -346,19 +346,19 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
 
       file << "set( " << this->RunResultVariable << " \n     \""
            << this->Makefile->GetSafeDefinition(this->RunResultVariable)
-           << "\"\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\n\n";
+           << "\"\n     CACHE STRING \"Result from try_run\" FORCE)\n\n";
 
       if (out) {
         file << "set( " << internalRunOutputName << " \n     \""
              << this->Makefile->GetSafeDefinition(internalRunOutputName)
-             << "\"\n     CACHE STRING \"Output from TRY_RUN\" FORCE)\n\n";
+             << "\"\n     CACHE STRING \"Output from try_run\" FORCE)\n\n";
       }
       file.close();
     }
     firstTryRun = false;
 
     std::string errorMessage =
-      cmStrCat("TRY_RUN() invoked in cross-compiling mode, "
+      cmStrCat("try_run() invoked in cross-compiling mode, "
                "please set the following cache variables "
                "appropriately:\n   ",
                this->RunResultVariable, " (advanced)\n");

+ 1 - 1
Tests/CMakeLists.txt

@@ -528,7 +528,7 @@ if(BUILD_TESTING)
     PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target: test")
   ADD_TEST_MACRO(CrossCompile CrossCompile)
   set_tests_properties(CrossCompile PROPERTIES
-    PASS_REGULAR_EXPRESSION "TRY_RUN.. invoked in cross-compiling mode")
+    PASS_REGULAR_EXPRESSION "try_run.. invoked in cross-compiling mode")
   if("${CMAKE_GENERATOR}" MATCHES "Make")
     ADD_TEST_MACRO(Policy0002 Policy0002)
   endif()

+ 1 - 1
Tests/TryCompile/CMakeLists.txt

@@ -201,7 +201,7 @@ add_executable(TryCompile pass.c)
 
 ######################################
 
-# now two tests for TRY_RUN
+# now two tests for try_run()
 
 # try to run a file that should compile and run without error
 # also check that OUTPUT_VARIABLE contains both the compile output