[Cmake-commits] CMake branch, next, updated. v2.8.6-1842-g15d232c

[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  15d232c23dee0ccec86bb1e023a8571afaa035a1 (commit)
       via  b0c4a71cd8789edd7e94e3d526963b203ea24a3b (commit)
       via  553acec76b2dc333a418e0218d65dacb76e30a81 (commit)
      from  75ccbf660ac3108e0c187e83700be43a37836e3d (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15d232c23dee0ccec86bb1e023a8571afaa035a1
commit 15d232c23dee0ccec86bb1e023a8571afaa035a1
Merge: 75ccbf6 b0c4a71
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 12 08:26:14 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 12 08:26:14 2011 -0500

    Merge topic 'import-KWIML' into next
    
    b0c4a71 Merge branch 'upstream-kwiml' into import-KWIML
    553acec KWIML: Avoid redefining _CRT_SECURE_NO_DEPRECATE in test.h


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0c4a71cd8789edd7e94e3d526963b203ea24a3b
commit b0c4a71cd8789edd7e94e3d526963b203ea24a3b
Merge: 93cebca 553acec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 12 08:24:17 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 12 08:24:17 2011 -0500

    Merge branch 'upstream-kwiml' into import-KWIML


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=553acec76b2dc333a418e0218d65dacb76e30a81
commit 553acec76b2dc333a418e0218d65dacb76e30a81
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 12 07:59:53 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 12 08:00:13 2011 -0500

    KWIML: Avoid redefining _CRT_SECURE_NO_DEPRECATE in test.h
    
    If the including project defines this macro do not re-define it
    in the test header.

diff --git a/test/test.h b/test/test.h
index 8abb195..b87a0e7 100644
--- a/test/test.h
+++ b/test/test.h
@@ -28,7 +28,9 @@
 #define KWIML_HEADER1(x) <x>
 
 /* Quiet MS standard library deprecation warnings.  */
-#define _CRT_SECURE_NO_DEPRECATE
+#ifndef _CRT_SECURE_NO_DEPRECATE
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
 
 #else
 # error "test.h included multiple times."

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

Summary of changes:
 Utilities/KWIML/test/test.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake