Minor cleanup
Bump CMake subtree for proper lib resolval