Restore extra modules build in cmake