cmake: search the install prefix for cppunit incase it is installed there
Merge branch 'maint'
Merge branch 'master' into next