diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 9e2d6c149..e657f498d 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1036,6 +1036,7 @@ IF(BUILD_TESTING) --test-command testf) ENDIF(CMAKE_Fortran_COMPILER_FULLPATH) ENDIF(CMAKE_TEST_GENERATOR MATCHES "Makefiles") + IF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode") INCLUDE(FindJava) IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW) GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH) @@ -1058,7 +1059,8 @@ IF(BUILD_TESTING) 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") + IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR) # Will be set if the wxwindows gui is on