Updated CMake options.
Touched common sources.