Blender Git Commit Log

Git Commits -> Revision bbfcb0b

Revision bbfcb0b by Lukas Toenne (master)
March 25, 2014, 08:25 (GMT)
Build file macro for testing unordered_map C++ container support.

Using unordered_map and unordered_set C++ container types currently
requires careful testing or usage of boost, due to the various confusing
C++ version differences in include paths and namespaces.

Libmv defines tests for these cases in cmake and scons, such that ceres
can use any available implementation, or fall back too std::map/std::set
if none can be found.

This patch generalizes this buildfile code by providing a Blender macro.
* cmake: defines both the variables used by libmv at them moment as well
as 2 variables UNORDERED_MAP_INCLUDE_PREFIX and UNORDERED_MAP_NAMESPACE,
which can later be used in other C++ parts for convenience.
* scons: adds a tool script returning the include prefix and namespace.
Libmv checks these to define the appropriate definitions for ceres.

Differential Revision: https://developer.blender.org/D425

Commit Details:

Full Hash: bbfcb0b1e44636b73b8c46f1cb800fa53dda5277
Parent Commit: 6452d9f
Lines Changed: +129, -66

1 Added Path:

/build_files/scons/tools/unordered_map.py (+32, -0) (View)

3 Modified Paths:

/build_files/cmake/macros.cmake (+71, -0) (Diff)
/extern/libmv/third_party/ceres/CMakeLists.txt (+7, -40) (Diff)
/extern/libmv/third_party/ceres/SConscript (+19, -26) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021