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, master has been updated
via 565744bd3db6f730a31e0325a1c7336224237d12 (commit)
via eb410e8dd8f4d1401d11713f398d38e0f250b136 (commit)
via 5ead31da6341eb5a410f9f5b7b65cd5dcd8f0eae (commit)
via 1333b576b56de852d826e886955d09de0f8c0ef6 (commit)
via 9081e3a1355bf312e54b4a71e879a72e93933ef0 (commit)
via f430bea11b47327f582ca1609c9f0cec0204d628 (commit)
via f2c12887ba9fcde6c1f70ade72d231d131d172e5 (commit)
via 44b9bbc89dee8c86cfc48ec4cb2cbe952b05c20f (commit)
via 57156a5d30aae61f170e8721f330a0b207797330 (commit)
via f1abdce1cc7df4ace0a15c9fb0c62d975f92fa3a (commit)
via 2de963d9966f7ffbdbd75f6d55661ab635cfb3d7 (commit)
via 50b6f33dbcb76f44de6294ad79e7d3002c69aa51 (commit)
via c05653e18c2baca1abe9d01a06810d997d13f337 (commit)
via ab245ff3c824797a5a7437330e077a2e6a58593b (commit)
via bf58e9adec832608c35119ce7d5334ec750c15d2 (commit)
via 2fb07fc44c49da70a609fbc0df013c0301e9f36a (commit)
via 518c06585b07c1b7a189374c9196fc1a7fc3502d (commit)
via 41c28dc35ba7efaf9426a8b8f5597aee11b7db61 (commit)
via f13a6a087e3f882b496ab34c12cc7777795a5c2f (commit)
via 555bda4e436435c37690aa5f31f4d254793d5b4e (commit)
via 69bc5131b2e5590e94048933b37019c0773a0cf7 (commit)
via f1aa026fb9bc5219a59a4c3a273023da51e50dbd (commit)
via eda30754781a3ef4d3a0e9fa72f1bade50bb6a94 (commit)
via 1d55ea557d30bfb42e5f1a7df431d144d1c9696b (commit)
via 6e6886d3bd4037905c320b8d88417096f6ba3e2e (commit)
via 654608600474a27eeddafd50ea25c7e3882fd460 (commit)
via 220fdc16fc577feb3401a44eea475dae119257b0 (commit)
via 77cb7b502f3a90c75e92df655f2d37132ee5627f (commit)
via e2ffa14b998f670a3112b9f8cb4edb6f720d6386 (commit)
via ab8a2a57f2a4f746a42c4b7a1d52f93c15216b68 (commit)
via 4b43999ca307894caaabe8857412f5f575e60583 (commit)
via 54a388beaaec8b9a4e4bb6bfb220d5711a866866 (commit)
via 43200c145d9690701f0cc6dbd5c60ee3ece5edf8 (commit)
via 12cc6434bfad53a4bc45b0ab36d27489346dfadc (commit)
via 5590625fa3d3e6261cc5c9e39e02a205b1ed8027 (commit)
via 38aa9e97f275e5a8a4054b58bd4f004fea8c1675 (commit)
via 7b91c3dfac88b2d01a8bac71e800032fcd03ec54 (commit)
via c54ef23c16cfa40c8016643d0a6471539f04fabe (commit)
via 4db9dd89df2cc21747c65383b197efb9ca5cba4d (commit)
via ba8d0db217399dede6d897c928b4dbf52e7e141b (commit)
via 343ff7a72e7c08f3a63dde25bd1f06c8c3854f56 (commit)
via 1a38a5d65fa33f8ff06104b23f9bd38110387ddc (commit)
via db607dea8dbb0d16e75e5ae1e764002e4ce8e605 (commit)
via 7553a3799a188594ee0bda46b18095479e3ee54b (commit)
via 8b27a94f2879b3ea1c00e1e0e4bef7cc77fd2cb6 (commit)
via 64c5752d938457be411e3a9d781d4441e6634743 (commit)
via 0412e5c9330606b29ef61199b44e99daf5f28097 (commit)
via 941afa571c9f45c52bb935bad1c3b83fe415372e (commit)
via 033a687acd828ad6667d154939ffdbc482ab047f (commit)
via 1d40729eaa35dd643efdf5e793e6a541e890f33a (commit)
from 8d198a71fc157343de56b0addcd987681639c127 (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=565744bd3db6f730a31e0325a1c7336224237d12
commit 565744bd3db6f730a31e0325a1c7336224237d12
Merge: 8d198a7 eb410e8
Author: David Cole <david.c...@kitware.com>
AuthorDate: Tue Jun 19 14:42:41 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jun 19 14:42:41 2012 -0400
Merge topic 'ninja-cldeps'
eb410e8 Ninja: disable cldeps for bcc32, it's too old, and ninja would also
not build
5ead31d Ninja: try work around for bcc32 bug
1333b57 Ninja: build server fixes
9081e3a remove warning about unused parameter
f430bea Ninja: maybe this fixes the bcc32 build
f2c1288 Ninja: msvc6 for-scoping
44b9bbc Ninja: build with old msvc versions
57156a5 Ninja: build server fixes
f1abdce Ninja: some bytes of the rc files couldn't be piped correctly
2de963d Ninja: don't remove space between command and parameters
50b6f33 Ninja: build cmcldeps with mingw
c05653e Ninja: try to make GetProcessId visible
ab245ff Ninja: but cl supports /nologo ...
bf58e9a Ninja: no /nologo option in old rc.exe
2fb07fc Ninja: Eclipse and KDevelop fixes for ninja
518c065 Ninja: don't pollute build dir with preprocessed rc files
...
diff --cc Source/CMakeLists.txt
index e9ac0ed,bf75958..2c6bc76
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@@ -383,8 -383,13 +383,13 @@@ IF(CMAKE_ENABLE_NINJA
cmNinjaUtilityTargetGenerator.h
)
ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
+ IF(WIN32 AND NOT CYGWIN AND NOT BORLAND)
+ SET_SOURCE_FILES_PROPERTIES(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS
_WIN32_WINNT=0x0501)
+ ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
+ INSTALL_TARGETS(/bin cmcldeps)
+ ENDIF()
ELSE()
- MESSAGE(STATUS "Ninja generator disabled, enforce with
-DCMAKE_ENABLE_NINJA=ON")
+ MESSAGE(STATUS "Ninja generator disabled, enable it with
-DCMAKE_ENABLE_NINJA=ON")
ENDIF()
# create a library used by the command line and the GUI
diff --cc Source/cmNinjaTargetGenerator.cxx
index a362d13,f76bc0b..6157931
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -361,10 -391,18 +388,18 @@@ cmNinjaTargetGenerato
std::string cmdLine =
this->GetLocalGenerator()->BuildCommandLine(compileCmds);
+ if(useClDeps)
+ {
+ std::string cl = mf->GetDefinition("CMAKE_C_COMPILER");
+ cl = "\"" + cl + "\" ";
+ cmdLine = clDepsBinary + " " + lang + " $in \"$DEP_FILE\" $out "
+ + clShowPrefix + " " + cl + cmdLine;
+ }
+
// Write the rule for compiling file of the given language.
- std::ostringstream comment;
+ cmOStringStream comment;
comment << "Rule for compiling " << language << " files.";
- std::ostringstream description;
+ cmOStringStream description;
description << "Building " << language << " object $out";
this->GetGlobalGenerator()->AddRule(this->LanguageCompilerRule(language),
cmdLine,
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCCompiler.cmake.in | 3 +
Modules/CMakeCXXCompiler.cmake.in | 3 +
Modules/CMakeClDeps.cmake | 37 ++
Modules/CMakeDetermineCCompiler.cmake | 4 +-
Modules/CMakeDetermineCXXCompiler.cmake | 1 +
Source/CMakeLists.txt | 5 +
Source/cmExtraEclipseCDT4Generator.cxx | 6 +-
Source/cmGlobalKdevelopGenerator.cxx | 3 +
Source/cmGlobalNinjaGenerator.cxx | 35 ++-
Source/cmGlobalNinjaGenerator.h | 8 +
Source/cmLocalGenerator.cxx | 7 +
Source/cmLocalGenerator.h | 5 +
Source/cmLocalNinjaGenerator.cxx | 2 +
Source/cmNinjaNormalTargetGenerator.cxx | 72 ++--
Source/cmNinjaNormalTargetGenerator.h | 3 -
Source/cmNinjaTargetGenerator.cxx | 95 ++++-
Source/cmNinjaTargetGenerator.h | 3 +
Source/cmcldeps.cxx | 736 +++++++++++++++++++++++++++++++
Tests/BuildDepends/CMakeLists.txt | 8 +-
19 files changed, 961 insertions(+), 75 deletions(-)
create mode 100644 Modules/CMakeClDeps.cmake
create mode 100644 Source/cmcldeps.cxx
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
