Updated CMake files for find and bundling.