diff options
| author | David Cole <david.cole@kitware.com> | 2010-10-28 18:10:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-10-28 18:10:48 (GMT) |
| commit | a3edde36ad870d669c054701bccf6c1d14d2d72c (patch) | |
| tree | 9d1b26b96e8059f2be270a8038013b5a67c2b616 | |
| parent | 3f3f3e5f546fc953c899a6054f76b42851421b67 (diff) | |
| parent | c8f39193e01e15a13a37ca227f02a2e4472f3d8a (diff) | |
| download | CMake-a3edde36ad870d669c054701bccf6c1d14d2d72c.zip CMake-a3edde36ad870d669c054701bccf6c1d14d2d72c.tar.gz CMake-a3edde36ad870d669c054701bccf6c1d14d2d72c.tar.bz2 | |
Merge topic 'avoid-busted-java-test-on-macs'
c8f3919 Avoid problem reading jni.h on Macs.
| -rw-r--r-- | Tests/CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
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") |