forked from bartvdbraak/blender
5b7cad343e
Currently only put sources of Ceres library into extern/libmv/third_party and setup CMake and SCons building systems. Integration details: - Even CMake build files are not re-used from Ceres's trunk: they're using some automatic stuff detection like glog, pthreads, protobuf and so and it's not so clear how to re-use that files without modifications. And IMO it's easier if build files are getting re-generated automatically to match Blender-specific setup rather than keeping changes made locally in Blender in sync when re-bundling Ceres library. Especially in case when it's alerady needed to support SCons build system. - Integrated only actual sources, all tests were stripped. Probably it'll be nice to have them, but they'll need clear integration with current module test stuff in Blender. Hopefully integration went smooth. - Suitesparse was disabled. It'll help a lot having it, but there are some difficulties making cholmod working fine on windows. Would be added in future - collections_port.cc was also stripped. It's not used by Ceres's upstream and it gives compilation error (undefined uint32 -- looks like namespace issue). - Currently all schur eliminators are included. Not sure if it makes sense, also not sure if it makes sense having them switchable on and off -- IMO better to have single configuration which works and does not require special tweaks after everything was set up. - Personally i'd say if some of Ceres modules are not used better to drop it away -- all symbols would be stripped anyway, but it'll be waste of compilation time which is annoying in cases when one doing, say, binary search of revision at which some regression was introduced. Especially when it's easy to add modules which should be used by Blender. But as long as it stays in Tomato i'm not worrying much about this. To bundle updated version of Ceres: - You'll need to use GIT-SVN checkout, Re-bundling Ceres using SVN is still NOT supported! - Go to extern/libmv/third_party/ceres folder - Run ./bundle.sh This will checkout fresh Ceres snapshot of Windows branch (which is currently most interesting from integration into Blender POV), apply all patches listed in patches/series and copy needed files into Blender's working copy. This will also re-generate CMake/SCons build rules. If you'll need extra files from Ceres repository which are not present in Blender, you'll need to copy them manually and then run ./mkfiles.sh from extern/libmv/third_party/ceres folder which will update list of files used by Blender. Thanks all Ceres developers for this library and thanks to Keir Mierle with help integrating Ceres into Blender! |
||
|---|---|---|
| .. | ||
| libmv | ||
| patches | ||
| third_party | ||
| bundle.sh | ||
| ChangeLog | ||
| CMakeLists.txt | ||
| files.txt | ||
| libmv-capi.cpp | ||
| libmv-capi.h | ||
| mkfiles.sh | ||
| SConscript | ||