CMake improvements 2