[Cmake-commits] CMake branch, next, updated. v2.8.8-3191-g5844cc1

[Peter Kuemmel]

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  5844cc17e5a4f66cbfb9ae998ea5b7984df54a73 (commit)
       via  50b6f33dbcb76f44de6294ad79e7d3002c69aa51 (commit)
       via  c05653e18c2baca1abe9d01a06810d997d13f337 (commit)
      from  98b43a127d8a5a4e6204e64a16f2783a4fe42273 (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=5844cc17e5a4f66cbfb9ae998ea5b7984df54a73
commit 5844cc17e5a4f66cbfb9ae998ea5b7984df54a73
Merge: 98b43a1 50b6f33
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 07:48:07 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 15 07:48:07 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    50b6f33 Ninja: build cmcldeps with mingw
    c05653e Ninja: try to make GetProcessId visible


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50b6f33dbcb76f44de6294ad79e7d3002c69aa51
commit 50b6f33dbcb76f44de6294ad79e7d3002c69aa51
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 13:46:18 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Fri Jun 15 13:46:49 2012 +0200

    Ninja: build cmcldeps with mingw

diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 56c5ca4..e939f61 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -317,7 +317,7 @@ private:
     ASD.insert(deps.begin(), deps.end());
   }
 
-  std::string cmGlobalNinjaGenerator::ninjaCmd() const;
+  std::string ninjaCmd() const;
 
 private:
   /// The file containing the build statement. (the relation ship of the
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 1d69608..1eadf61 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -22,6 +22,8 @@
 #include <string>
 #include <vector>
 #include <queue>
+#include <cstdio>
+
 using namespace std;
 
 #ifdef _WIN32

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c05653e18c2baca1abe9d01a06810d997d13f337
commit c05653e18c2baca1abe9d01a06810d997d13f337
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 13:38:52 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Fri Jun 15 13:38:52 2012 +0200

    Ninja: try to make GetProcessId visible

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ebeda56..3f8a27e 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -383,7 +383,8 @@ IF(CMAKE_ENABLE_NINJA)
     cmNinjaUtilityTargetGenerator.h
     )
   ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
-  IF(MSVC) # TODO WIN32
+  IF(WIN32)
+    SET_SOURCE_FILES_PROPERTIES(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
     ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
     INSTALL_TARGETS(/bin cmcldeps)
   ENDIF()

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

Summary of changes:
 Source/CMakeLists.txt           |    3 ++-
 Source/cmGlobalNinjaGenerator.h |    2 +-
 Source/cmcldeps.cxx             |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake