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 1f81929a0761b276be28d86cef2ca77a5cd25683 (commit) via c8f39193e01e15a13a37ca227f02a2e4472f3d8a (commit) from aa3a813805ab22c0b64350f74f6e48d021748039 (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=1f81929a0761b276be28d86cef2ca77a5cd25683 commit 1f81929a0761b276be28d86cef2ca77a5cd25683 Merge: aa3a813 c8f3919 Author: David Cole <david.c...@kitware.com> AuthorDate: Mon Oct 25 15:09:23 2010 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Oct 25 15:09:23 2010 -0400 Merge topic 'avoid-busted-java-test-on-macs' into next c8f3919 Avoid problem reading jni.h on Macs. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8f39193e01e15a13a37ca227f02a2e4472f3d8a commit c8f39193e01e15a13a37ca227f02a2e4472f3d8a Author: David Cole <david.c...@kitware.com> AuthorDate: Mon Oct 25 15:03:36 2010 -0400 Commit: David Cole <david.c...@kitware.com> CommitDate: Mon Oct 25 15:03:36 2010 -0400 Avoid problem reading jni.h on Macs. Apple released an update recently in which there was a broken symlink for jni.h that pointed to a non-existent file. CMake had trouble configuring because it encountered an error trying to read jni.h. We avoid the problem here by introducing a variable CTEST_RUN_Java, which defaults to OFF on Macs, that indicates whether to even attempt finding java, reading jni.h and adding the "Java" CMake test. If you would like to test Java on a Mac where the jni.h symlink is not busted, feel free to pass in -DCTEST_RUN_Java:BOOL=ON when configuring CMake. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c056e86..d618ab4 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1635,7 +1635,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ ENDIF() ENDIF() - IF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode") + if(NOT DEFINED CTEST_RUN_Java) + if(APPLE) + set(CTEST_RUN_Java OFF) + else() + set(CTEST_RUN_Java ON) + endif() + endif() + + IF(CTEST_RUN_Java) find_package(Java QUIET) IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW) GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH) @@ -1659,7 +1667,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ ENDIF("${JNI_FILE}" MATCHES "JDK1_2") ENDIF(JNI_H) ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW) - ENDIF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode") + ENDIF(CTEST_RUN_Java) # 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 | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits