[Cmake-commits] CMake branch, next, updated. v2.8.2-730-geb035b6

David Cole david.cole at kitware.com
Thu Sep 9 15:56:37 EDT 2010


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  eb035b65264fbd72f49381a5bdd40f8e1c13da74 (commit)
       via  20a6f6cf7ae0442e3687f0fdd4b151ba2c196674 (commit)
      from  8ab4a4ca92cc4a5350fabb144d8a91dd681b6ee0 (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=eb035b65264fbd72f49381a5bdd40f8e1c13da74
commit eb035b65264fbd72f49381a5bdd40f8e1c13da74
Merge: 8ab4a4c 20a6f6c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 9 15:56:35 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 9 15:56:35 2010 -0400

    Merge topic 'shut-up-find-java' into next
    
    20a6f6c Use QUIET to avoid Java status messages.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20a6f6cf7ae0442e3687f0fdd4b151ba2c196674
commit 20a6f6cf7ae0442e3687f0fdd4b151ba2c196674
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 9 15:39:19 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Sep 9 15:41:53 2010 -0400

    Use QUIET to avoid Java status messages.
    
    CMake devs mostly do not care when Java is found successfully.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8e8d0ca..eb86a34 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1630,7 +1630,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   ENDIF()
 
   IF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode")
-    INCLUDE(FindJava)
+    find_package(Java QUIET)
     IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW)
       GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH)
       FIND_FILE(JNI_H jni.h

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list