Improved cmake configuration.