Merge branch 'bray/cmake_improvements' of https://gitlab.kitware.com/iMSTK/iMSTK into cmake_improvements