Applied Sheri's patch to CMakeLists.txt to add library name options and correct the recursion comment.