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 4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca (commit)
via 5ae0d331ff4b7b7ea5b2098dce7b1a91f739746b (commit)
from f5edf51d22446cfa669fcbbc57e1b6a1cef3f962 (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=4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca
commit 4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca
Merge: f5edf51 5ae0d33
Author: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
AuthorDate: Fri Apr 15 14:47:42 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Apr 15 14:47:42 2016 -0400
Merge topic 'teach-custom-command-crosscompiling-emulator' into next
5ae0d331 CustomCommandGenerator: Fix pseudo_emulator_custom_command.c build
error
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ae0d331ff4b7b7ea5b2098dce7b1a91f739746b
commit 5ae0d331ff4b7b7ea5b2098dce7b1a91f739746b
Author: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
AuthorDate: Fri Apr 15 14:46:05 2016 -0400
Commit: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
CommitDate: Fri Apr 15 14:46:05 2016 -0400
CustomCommandGenerator: Fix pseudo_emulator_custom_command.c build error
This commit fixes the following error reported on VisualStudio:
pseudo_emulator_custom_command.c(17): error C2143: syntax error : missing
';' before 'const'
diff --git a/Tests/RunCMake/pseudo_emulator_custom_command.c
b/Tests/RunCMake/pseudo_emulator_custom_command.c
index 4a915bf..8b2b632 100644
--- a/Tests/RunCMake/pseudo_emulator_custom_command.c
+++ b/Tests/RunCMake/pseudo_emulator_custom_command.c
@@ -10,12 +10,13 @@
int main(int argc, char * argv[] )
{
+ const char* substring = "generated_exe";
+ const char* string = 0;
if (argc < 2)
{
return EXIT_FAILURE;
}
- const char* substring = "generated_exe";
- const char* string = argv[1];
+ string = argv[1];
if (strstr(string, substring) != 0)
{
return EXIT_SUCCESS;
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/pseudo_emulator_custom_command.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
