Gave the cmake section a makeover.