Merge branch 'garth/merge-fix-119'
Some CMake/JIT fixes related to VTK.
Merge branch 'garth/fix-cmake-3-issues' into next