Merge "Updates to CMake compile scripts" into devel/master