CMakefile adjusts