Merge branch 'cyberfuzzie/cmake-config'