Simplified CMake tests a little
Merge branch 'cmake-fix2' into refcountptr

Conflicts:
	taglib/toolkit/trefcountptr.h
	taglib/toolkit/tsmartptr.h