From 6f734b9ee0e49142fab317f676df1b048cb13ced Mon Sep 17 00:00:00 2001
From: Marcin Woliński <wolinski@ipipan.waw.pl>
Date: Mon, 30 Jul 2018 18:17:26 +0200
Subject: [PATCH] poinstruowanie cmake’a, że Python 3.4 jest cacy
---
buildAll.sh | 12 ++++++------
morfeusz/wrappers/python3/CMakeLists.txt | 1 +
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/buildAll.sh b/buildAll.sh
index 998f967..8c11421 100755
--- a/buildAll.sh
+++ b/buildAll.sh
@@ -285,12 +285,12 @@ buildDictionaries 2>&1 | log All all
buildegg Windows i386 true 2.7 2>&1 | log Windows i386; \
build Windows i386 true 3.0 py3morfeusz 2>&1 | log Windows i386 \
buildegg Windows i386 true 3.0 2>&1 | log Windows i386"
- # echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64; \
- # buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64; \
- # build Darwin amd64 true 3 py3morfeusz 2>&1 | log Darwin amd64; \
- # buildegg Darwin amd64 true 3 2>&1 | log Darwin amd64"
- # echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64"
- # echo "buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64"
+ echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64; \
+ buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64; \
+ build Darwin amd64 true 3 py3morfeusz 2>&1 | log Darwin amd64; \
+ buildegg Darwin amd64 true 3 2>&1 | log Darwin amd64"
+ echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64"
+ echo "buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64"
} | xargs -n1 -P6 -d$'\n' bash -c
diff --git a/morfeusz/wrappers/python3/CMakeLists.txt b/morfeusz/wrappers/python3/CMakeLists.txt
index 006b261..98a77e8 100644
--- a/morfeusz/wrappers/python3/CMakeLists.txt
+++ b/morfeusz/wrappers/python3/CMakeLists.txt
@@ -2,6 +2,7 @@
# SWIG
#set(CMAKE_SWIG_OUTDIR swig)
#~ FIND_PACKAGE (SWIG REQUIRED)
+set(Python_ADDITIONAL_VERSIONS 3.4)
FIND_PACKAGE (PythonLibs ${PY} REQUIRED)
#~ INCLUDE (${SWIG_USE_FILE})
--
libgit2 0.22.2