Fix CMake to work with CppUnit
Fix CMake to work with CppUnit