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.
2013-08-23 18:48:08 +04:00
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
2013-08-23 18:46:54 +04:00
dbb684b85f
Bumped minimal Python version to 2.6.
...
Rationale: we already depend on it (e.g. some scripts use print_function).
2013-08-23 18:46:54 +04:00
1a81da012d
Removed old Python detection cruft.
...
None of this should be relevant as of CMake 2.8.7.
2013-08-23 18:46:51 +04:00
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
b84b8db277
Removed useless .*
2013-08-06 14:28:07 +04:00
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.
2013-08-03 00:17:40 +04:00
bce1b352e7
Updated cmake files to use print().
...
In these cases, just using print() is enough to ensure py2/3
compatibility.
2013-06-13 20:10:01 -04:00
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
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.
2013-04-17 12:33:11 +04:00
b2ba8b9969
Drop old python interface
2013-04-12 19:37:40 +04:00
bd38a1945d
Honor 2-digit python version
2013-02-28 16:32:13 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
ca6f2f080f
hopefully, correctly applied modified patch #2034 that handles Windows case
2012-10-08 22:18:13 +04:00
cfa9aa9206
Search python libs exactly matching to python executable on cmake 2.8.9 and newer
2012-06-24 18:25:01 +00:00
c9027fecc0
Fixed few MinGW build problems
2012-05-20 18:45:19 +00:00
b8804ccc17
Fixed problem with manually set PYTHON_PACKAGES_PATH #1891
2012-05-18 07:43:12 +00:00
78915e016c
Fixed python version issue #1903
2012-05-14 14:05:25 +00:00
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
2c2616d46f
#1508 prefer architecture-specific install directory for python bindings, when LIB_SUFFIX is used
2012-03-28 13:37:58 +00:00
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
2012-03-03 15:49:23 +00:00
2f4bb580fc
Fixed some build warnings; slightly improved python search
2012-03-02 08:34:54 +00:00
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
2012-02-03 11:26:49 +00:00
Roman Donchenko