3 Commits

Author	SHA1	Message	Date
Anatoly Baksheev	37a754621a	Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h' ... Conflicts: apps/traincascade/boost.cpp	2013-11-27 14:53:21 +00:00
Andrey Kamaev	bd0e0b5800	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +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