CMakefile modifications