[Cmake-commits] CMake branch, next, updated. v2.8.8-3085-g0a80d9c

[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  0a80d9c45650b7425c24595ed14c0c55ae0a8b36 (commit)
       via  0412e5c9330606b29ef61199b44e99daf5f28097 (commit)
      from  18ec852f3529d270568135eb788d70f91c562748 (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=0a80d9c45650b7425c24595ed14c0c55ae0a8b36
commit 0a80d9c45650b7425c24595ed14c0c55ae0a8b36
Merge: 18ec852 0412e5c
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 9 03:06:56 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 9 03:06:56 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    0412e5c Ninja: assume cmcldeps in the same dir as cmake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0412e5c9330606b29ef61199b44e99daf5f28097
commit 0412e5c9330606b29ef61199b44e99daf5f28097
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 9 09:06:01 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sat Jun 9 09:06:01 2012 +0200

    Ninja: assume cmcldeps in the same dir as cmake

diff --git a/Modules/CMakeClDeps.cmake b/Modules/CMakeClDeps.cmake
index 435a6c5..9fac729 100644
--- a/Modules/CMakeClDeps.cmake
+++ b/Modules/CMakeClDeps.cmake
@@ -1,5 +1,5 @@
 IF(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_C_COMPILER)
-  FIND_PROGRAM(CMAKE_CMCLDEPS_EXECUTABLE NAMES cmcldeps.exe)
+  STRING(REPLACE "cmake.exe" "cmcldeps.exe"  CMAKE_CMCLDEPS_EXECUTABLE ${CMAKE_COMMAND})
   SET(showdir ${CMAKE_BINARY_DIR}/CMakeFiles/ShowIncludes)
   FILE(WRITE ${showdir}/foo.h "\n")
   FILE(WRITE ${showdir}/main.c "#include \"foo.h\" \nint main(){}\n")

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

Summary of changes:
 Modules/CMakeClDeps.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake