10 Commits

Author	SHA1	Message	Date
Andrey Kamaev	c5aba337e9	Fixed number of warnings. Fixed mingw64 build.	2012-06-12 14:46:12 +00:00
Andrey Kamaev	8d135e8ea1	Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows.	2012-05-13 09:34:33 +00:00
Vadim Pisarevsky	2fd1e2ea57	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +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
Andrey Kamaev	9d5c24cdc8	Updating opencv module definition in cmake (continued)	2012-01-25 09:04:49 +00:00
Andrey Kamaev	13f4e70e95	Updating opencv module definition in cmake	2012-01-24 16:55:47 +00:00
Andrey Kamaev	5cce038958	Performance testing branch is merged back into trunk	2011-09-06 15:30:28 +00:00
Vadim Pisarevsky	6f44457de8	the combined cxts + gtest	2011-02-09 22:03:01 +00:00
Vadim Pisarevsky	23e83f8fc7		2011-02-09 21:58:31 +00:00
Vadim Pisarevsky	e4b91918b1	the combined cxts + gtest	2011-02-09 21:56:48 +00:00