From d8c95a58d1c031c5d54bfc89e681f33712973b36 Mon Sep 17 00:00:00 2001
From: "johannes.heinecke" <johannes.heinecke@orange.fr>
Date: Sun, 6 Nov 2016 15:56:21 +0100
Subject: [PATCH] minor change to work also with swig > 3
---
maca_export/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maca_export/CMakeLists.txt b/maca_export/CMakeLists.txt
index d9a5050..8ba50a4 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)
--
GitLab