[Cmake-commits] CMake branch, next, updated. v2.8.12-4295-gd71fa3e

Rolf Eike Beer eike at sf-mail.de
Tue Oct 22 14:55:01 EDT 2013


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  d71fa3e0e5f64aabacd6ae21353c540457c8556d (commit)
       via  c832299e9094f76e58bc67d802061015daf5c1d9 (commit)
      from  2650c482fc6404e6eb2fe05c30f5e6b3c609e88b (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=d71fa3e0e5f64aabacd6ae21353c540457c8556d
commit d71fa3e0e5f64aabacd6ae21353c540457c8556d
Merge: 2650c48 c832299
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 22 14:54:56 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 22 14:54:56 2013 -0400

    Merge topic 'FindJava-msg' into next
    
    c832299 FindJava: fix message output (#14502)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c832299e9094f76e58bc67d802061015daf5c1d9
commit c832299e9094f76e58bc67d802061015daf5c1d9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 22 20:51:32 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Oct 22 20:51:32 2013 +0200

    FindJava: fix message output (#14502)

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 2d1a976..e35fc1d 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -111,7 +111,7 @@ if(Java_JAVA_EXECUTABLE)
       if(${Java_FIND_REQUIRED})
         message( FATAL_ERROR "Error executing java -version" )
       else()
-        message( STATUS "Warning, could not run java --version")
+        message( STATUS "Warning, could not run java -version")
       endif()
     else()
       # extract major/minor version and patch level from "java -version" output

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list