Noel Eck
d6bcab3c7b
doc: Small change to documentation in DectectPython.cmake
...
Fixed small typo for python 3 default version.
Signed-off-by: Noel Eck <noel.eck@intel.com>
8 years ago
Jeroen Kromwijk
401537ebab
Detect the correct Python major version
8 years ago
Alexander Alekhin
2d10336601
fix documentation
8 years ago
Alexander Alekhin
c0fe374490
cmake: python, allow dynamic symbols lookup from libpython.so
9 years ago
Alexander Alekhin
9bee835dac
cmake: fix python detection
9 years ago
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
9 years ago
Alexander Alekhin
bbff288447
fix build with python3 only
9 years ago
Alexander Alekhin
0906744788
fix python cross-compilation
10 years ago
Alexander Alekhin
2c2645191a
fix python cross-compilation
10 years ago
yanlend
443b3157e0
Fix win32 search for same bitness executable
...
find_package(PythonInterp) calls find_program(PYTHON_EXECUTABLE), i.e. without version number. For the Win32-search before to be effective, the same variable has to be used.
10 years ago
Kevin Squire
5e354fa844
Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden
10 years ago
Vadim Pisarevsky
643bbb2d93
looks like Maksim was right; the new fix does not do the second attempt to detect python libs, it finds it correctly with the first attempt
10 years ago
Vadim Pisarevsky
4aa6d10a60
added Maksim's fix as well; they both handle correctly more cases than each of them individually
10 years ago
Vadim Pisarevsky
7a52c3d9f1
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
...
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
10 years ago
Maksim Shabunin
bebf6c47c6
Removed Sphinx generation commands from cmake scripts
10 years ago
Maksim Shabunin
1b4e3ec35a
Changed cmake python library search startegy for crosscompiling
10 years ago
Maksim Shabunin
b3bae170ed
Fixed java tests build
...
- disabled xfeature2d dependency for java wrappers
- fixed java wrappers build after cmake rerun
- disabled opencv_ml tests temporarily
- fixed Imgproc usage in java tests
10 years ago
Maksim Shabunin
2c2cdcf789
Changed cmake python library search startegy for crosscompiling
10 years ago
Alexander Alekhin
b3a54d588b
fix binary package build
10 years ago
Michael Pratt
cac1218eef
Build both Python 2 and Python 3 bindings
...
If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process. Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.
The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python. Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3. Both are built from the same source. but for different
versions of Python.
11 years ago
Vincent Rabaud
167a26642e
fix message sent to user during cross_compilation
11 years ago
Vincent Rabaud
eabcfa5652
reorder the if's for clarity
11 years ago
Vincent Rabaud
6cb90c0e97
fix cross-compilation issue with Numpy
11 years ago
Roman Donchenko
9e3673ef53
Don't use PYTHON_VERSION_STRING when searching for Python libraries
...
It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.
11 years ago
Vadim Pisarevsky
de521fc9fa
fixed some more compile bugs (including Python bindings)
11 years ago
Alexander Alekhin
4adede4246
cmake: python module updates
11 years ago
antonella
5b2d557502
Added plantuml extension
...
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
11 years ago
Roman Donchenko
055a581977
Moved Sphinx detection outside of the PYTHONINTERP_FOUND block.
...
Who knows, maybe the user's Sphinx installation uses a Python we couldn't find.
11 years ago
Roman Donchenko
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
11 years ago
Roman Donchenko
dbb684b85f
Bumped minimal Python version to 2.6.
...
Rationale: we already depend on it (e.g. some scripts use print_function).
11 years ago
Roman Donchenko
1a81da012d
Removed old Python detection cruft.
...
None of this should be relevant as of CMake 2.8.7.
11 years ago
Alexander Shishkov
b84b8db277
Removed useless .*
12 years ago
Alexander Shishkov
afd7429cbd
Update OpenCVDetectPython.cmake
...
On my MacOS the output of the sphinx-build binary is the following:
Error: Insufficient arguments.
Sphinx v1.2b1
Usage: /usr/local/bin/sphinx-build [options] sourcedir outdir [filenames...]
...
I have installed sphinx, but without this change HAVE_SPHINX==0 for me, so I can't build docs.
12 years ago
Gabe Schwartz
bce1b352e7
Updated cmake files to use print().
...
In these cases, just using print() is enough to ensure py2/3
compatibility.
12 years ago
Roman Donchenko
bd6f80faf3
Redo the Sphinx check to do the same thing on all platforms.
...
This also fixes the bug where the Sphinx version gets detected as
"Sphinx vX.Y.Z" instead of "X.Y.Z" on Unix-like systems.
12 years ago
Andrey Kamaev
b2ba8b9969
Drop old python interface
12 years ago
Andrey Kamaev
bd38a1945d
Honor 2-digit python version
12 years ago
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
12 years ago
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
12 years ago
Vadim Pisarevsky
ca6f2f080f
hopefully, correctly applied modified patch #2034 that handles Windows case
12 years ago
Marina Kolpakova
162f9fd7ea
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
13 years ago
Andrey Kamaev
cfa9aa9206
Search python libs exactly matching to python executable on cmake 2.8.9 and newer
13 years ago
Andrey Kamaev
7b5a45eac4
Merged the trunk r8384:8407 (inclusive)
13 years ago
Andrey Kamaev
c9027fecc0
Fixed few MinGW build problems
13 years ago
Andrey Kamaev
e1c4fd9e1f
Merged the trunk r8345:8376
13 years ago
Andrey Kamaev
70166820ea
Merged the trunk r8324:8345
13 years ago
Andrey Kamaev
b8804ccc17
Fixed problem with manually set PYTHON_PACKAGES_PATH #1891
13 years ago
Andrey Kamaev
78915e016c
Fixed python version issue #1903
13 years ago
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
13 years ago
Andrey Kamaev
247e2d085f
Updated for cmake 2.8.8
13 years ago