[Cmake-commits] CMake branch, next, updated. v3.5.2-1281-gb728058

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b7280586e99d236ed8f7b411757909cac53846ed (commit)
       via  743675e2c36fcdb897aafc1f9041afcd2caceb64 (commit)
      from  9b6071c199ee3f90b104e10ef59d8dfc3337a434 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7280586e99d236ed8f7b411757909cac53846ed
commit b7280586e99d236ed8f7b411757909cac53846ed
Merge: 9b6071c 743675e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat May 7 08:43:58 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 7 08:43:58 2016 -0400

    Merge topic 'custom-command-CROSSCOMPILING_EMULATOR' into next
    
    743675e2 fixup! CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATOR


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=743675e2c36fcdb897aafc1f9041afcd2caceb64
commit 743675e2c36fcdb897aafc1f9041afcd2caceb64
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat May 7 08:38:19 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat May 7 08:38:19 2016 -0400

    fixup! CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATOR

diff --git a/Tests/RunCMake/pseudo_emulator_custom_command.c b/Tests/RunCMake/pseudo_emulator_custom_command.c
index 76995db..17181c9 100644
--- a/Tests/RunCMake/pseudo_emulator_custom_command.c
+++ b/Tests/RunCMake/pseudo_emulator_custom_command.c
@@ -6,27 +6,29 @@
 //
 //  /path/to/program arg1 [arg2 [...]]
 //
-// Return EXIT_SUCCESS if 'generated_exe_emulator_expected' string was found in <arg1>
-// Return EXIT_FAILURE if 'generated_exe_emulator_unexpected' string was found in <arg1>
+// Return EXIT_SUCCESS if 'generated_exe_emulator_expected'
+// string was found in <arg1>.
+// Return EXIT_FAILURE if 'generated_exe_emulator_unexpected'
+// string was found in <arg1>.
 
-int main(int argc, char * argv[] )
+int main(int argc, const char* argv[])
 {
   const char* substring_failure = "generated_exe_emulator_unexpected";
   const char* substring_success = "generated_exe_emulator_expected";
-  const char* string = 0;
-  string = argv[1];
+  const char* str = argv[1];
   if (argc < 2)
     {
     return EXIT_FAILURE;
     }
-  if (strstr(string, substring_success) != 0)
+  if (strstr(str, substring_success) != 0)
     {
     return EXIT_SUCCESS;
     }
-  if (strstr(string, substring_failure) != 0)
+  if (strstr(str, substring_failure) != 0)
     {
     return EXIT_FAILURE;
     }
-  fprintf(stderr, "Failed to find string '%s' in '%s'\n", substring_success, string);
+  fprintf(stderr, "Failed to find string '%s' in '%s'\n",
+          substring_success, str);
   return EXIT_FAILURE;
 }

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/pseudo_emulator_custom_command.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake