Improved CMakeLists.txt, where some of the command-line options have been renamed.