Improved OpenCV cmake-ing

To handle trunk version better.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMakeLists.txt