opencv

Commit Graph

Author	SHA1	Message	Date
Maksim Shabunin	bebf6c47c6	Removed Sphinx generation commands from cmake scripts	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 .*	11 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.	11 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
Andrey Kamaev	00de4b9314	Fixed compiler flags caching in toolchain; fixed zlib search.	13 years ago
Vadim Pisarevsky	2fd1e2ea57	merged all the latest changes from 2.4 to trunk	13 years ago
Andrey Kamaev	c16a1d86cc	Fixed python detection on Windows with both 32bit and 64bit pythons installed.	13 years ago
Andrey Kamaev	2c2616d46f	#1508 prefer architecture-specific install directory for python bindings, when LIB_SUFFIX is used	13 years ago
Andrey Kamaev	18dbe6b3e5	cmake scripts are updated to prefer includes from the OpenCV source tree	13 years ago
Andrey Kamaev	2f4bb580fc	Fixed some build warnings; slightly improved python search	13 years ago
Andrey Kamaev	984eb99428	Global CMake reorganization: [~] Automatically tracked dependencies between modules [+] Support for optional module dependencies [+] Options to choose modules to build [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV) [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules	13 years ago

39 Commits (998a909705ff8409809c655da28f59e334aee1bd)