CMakeLists changes
Require version 2.8.7 of cmake
Revert last commit