Fix for own commit: mixed up ceres build defines when replacing cmake
check with a generalized macro.

rBbbfcb0b1e44636b73b8c46f1cb800fa53dda5277
Merge branch 'master' into depsgraph_refactor
Merge branch 'depsgraph_refactor' into depsgraph_refactor_cpp