Merged mwiebe\'s CMakeList changes