Improved CMake build options.