Marina Kolpakova
162f9fd7ea
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
2012-06-28 17:07:17 +00:00
Andrey Kamaev
7b5a45eac4
Merged the trunk r8384:8407 (inclusive)
2012-05-30 08:04:37 +00:00
Andrey Kamaev
e1c4fd9e1f
Merged the trunk r8345:8376
2012-05-18 13:18:37 +00:00
Andrey Kamaev
70166820ea
Merged the trunk r8324:8345
2012-05-18 12:59:40 +00:00
Andrey Kamaev
247e2d085f
Updated for cmake 2.8.8
2012-04-19 22:33:46 +00:00
Andrey Kamaev
00de4b9314
Fixed compiler flags caching in toolchain; fixed zlib search.
2012-04-16 07:24:15 +00:00
Andrey Kamaev
c16a1d86cc
Fixed python detection on Windows with both 32bit and 64bit pythons installed.
2012-04-08 17:36:41 +00:00
Andrey Kamaev
2c2616d46f
#1508 prefer architecture-specific install directory for python bindings, when LIB_SUFFIX is used
2012-03-28 13:37:58 +00:00
Andrey Kamaev
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
2012-03-03 15:49:23 +00:00
Andrey Kamaev
2f4bb580fc
Fixed some build warnings; slightly improved python search
2012-03-02 08:34:54 +00:00
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
2012-02-03 11:26:49 +00:00
