CMakeLists changed by John