OpenCV 3.3.1 is breaking builds in Kinetic

General
4

I am getting a very similar error after upgrading apt packages today:

make[2]: *** No rule to make target 'opencv_calib3d-NOTFOUND'

In my CMakeLists.txt I already have the lines recommended by @lucasw.