[Cmake-commits] CMake branch, next, updated. v2.8.4-1220-g9ef9cbf

[Brad King]

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  9ef9cbfa56fa6dc2b03d9d2f494f2bf1e02d3d52 (commit)
       via  80ccc9aafb555f5a3c6f5f8e2f5825e92eaffc54 (commit)
      from  030f83de8ad285ddc6eb0d1726a0de8c0f117e52 (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=9ef9cbfa56fa6dc2b03d9d2f494f2bf1e02d3d52
commit 9ef9cbfa56fa6dc2b03d9d2f494f2bf1e02d3d52
Merge: 030f83d 80ccc9a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 18 14:20:57 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 18 14:20:57 2011 -0400

    Merge topic 'fix-Java-test-enable-logic' into next
    
    80ccc9a Disable Java test with Xcode generator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80ccc9aafb555f5a3c6f5f8e2f5825e92eaffc54
commit 80ccc9aafb555f5a3c6f5f8e2f5825e92eaffc54
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 18 14:18:11 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 18 14:18:11 2011 -0400

    Disable Java test with Xcode generator
    
    The parent commit 46c0a583 (Enable Java test more carefully on Apple,
    2011-03-18) failed to restore the exclusion of Xcode when enabling the
    Java test that was originally removed by commit c8f39193 (Avoid problem
    reading jni.h on Macs, 2010-10-25).  The Xcode generator does not work
    with the current Java support at all.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2dbb120..77c5752 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1869,7 +1869,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   ENDIF()
 
   find_package(Java QUIET)
-  IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW)
+  IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW
+      AND NOT "${CMAKE_TEST_GENERATOR}" MATCHES "Xcode")
     GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH)
     FIND_FILE(JNI_H jni.h
       "${JNIPATH}/../include"
@@ -1890,7 +1891,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
         LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Java")
       ENDIF("${JNI_FILE}" MATCHES "JDK1_2")
     ENDIF()
-  ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW)
+  ENDIF()
 
   # add some cross compiler tests, for now only with makefile based generators
   IF(CMAKE_TEST_GENERATOR MATCHES "Makefiles" OR CMAKE_TEST_GENERATOR MATCHES "KDevelop")

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

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


hooks/post-receive
-- 
CMake