yet more fixes in the cpp/CMakeLists.txt