CMake enhancements #1