Merge pull request #1321 from jcarpent/topic/cmake

Sync submodule CMake
9 jobs for devel in 116 minutes and 6 seconds (queued for 1 second)