diff --git a/maca_export/CMakeLists.txt b/maca_export/CMakeLists.txt index d9a505059c5c5def347a4001b7625983c9c95707..8ba50a4640cc14b73c305bb2c28270f9a1bb6cd8 100644 --- a/maca_export/CMakeLists.txt +++ b/maca_export/CMakeLists.txt @@ -1,6 +1,6 @@ if(MACA_EXPORT) - FIND_PACKAGE(SWIG 3.0) + FIND_PACKAGE(SWIG) if (SWIG_FOUND) FIND_PACKAGE(PythonLibs) @@ -37,7 +37,7 @@ if(MACA_EXPORT) FIND_PACKAGE(Java 1.7) FIND_PACKAGE(JNI) - if (JNI_FOUND AND Java_FOUND) + if (JNI_FOUND AND (Java_FOUND OR JAVA_FOUND)) set(JAVA_MODULE_NAME Macaon) set(JAVA_LIBRARY MacaonJava) set(JAVA_CLASS_TAGGER MacaonTransTagger)