Update and Add CMake option