Improoved CMake build