Commit 6f734b9ee0e49142fab317f676df1b048cb13ced

Authored by Marcin Woliński
1 parent f8887664

poinstruowanie cmake’a, że Python 3.4 jest cacy

(to na potrzeby Ubuntu 14.04)
ponadto: w buildAll, również Makintosze
buildAll.sh
... ... @@ -285,12 +285,12 @@ buildDictionaries 2>&1 | log All all
285 285 buildegg Windows i386 true 2.7 2>&1 | log Windows i386; \
286 286 build Windows i386 true 3.0 py3morfeusz 2>&1 | log Windows i386 \
287 287 buildegg Windows i386 true 3.0 2>&1 | log Windows i386"
288   - # echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64; \
289   - # buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64; \
290   - # build Darwin amd64 true 3 py3morfeusz 2>&1 | log Darwin amd64; \
291   - # buildegg Darwin amd64 true 3 2>&1 | log Darwin amd64"
292   - # echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64"
293   - # echo "buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64"
  288 + echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64; \
  289 + buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64; \
  290 + build Darwin amd64 true 3 py3morfeusz 2>&1 | log Darwin amd64; \
  291 + buildegg Darwin amd64 true 3 2>&1 | log Darwin amd64"
  292 + echo "build Darwin amd64 true 2 package package-java py2morfeusz 2>&1 | log Darwin amd64"
  293 + echo "buildegg Darwin amd64 true 2 2>&1 | log Darwin amd64"
294 294  
295 295 } | xargs -n1 -P6 -d$'\n' bash -c
296 296  
... ...
morfeusz/wrappers/python3/CMakeLists.txt
... ... @@ -2,6 +2,7 @@
2 2 # SWIG
3 3 #set(CMAKE_SWIG_OUTDIR swig)
4 4 #~ FIND_PACKAGE (SWIG REQUIRED)
  5 +set(Python_ADDITIONAL_VERSIONS 3.4)
5 6 FIND_PACKAGE (PythonLibs ${PY} REQUIRED)
6 7 #~ INCLUDE (${SWIG_USE_FILE})
7 8  
... ...