diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-18 18:18:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-03-18 18:18:11 (GMT) |
| commit | 80ccc9aafb555f5a3c6f5f8e2f5825e92eaffc54 (patch) | |
| tree | 22af6fcfefaac20858123727582089fcdbdff7ef /Tests | |
| parent | 46c0a5832d1e9334da10f3aa8495b2e6b551b23c (diff) | |
| download | CMake-80ccc9aafb555f5a3c6f5f8e2f5825e92eaffc54.zip CMake-80ccc9aafb555f5a3c6f5f8e2f5825e92eaffc54.tar.gz CMake-80ccc9aafb555f5a3c6f5f8e2f5825e92eaffc54.tar.bz2 | |
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.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
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") |