diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:18:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:37:24 +0300 |
| commit | 47adab4f993e66328bd1ad97abaf6697784ee8a0 (patch) | |
| tree | 3eb7046a95b0ce3f2ad707764213df372f22abbd /intern/libmv/bundle.sh | |
| parent | eee5a880f186fe9e49bd41a9dc7d6d0bdd371c36 (diff) | |
CMake: prepare for BLENDER_SORTED_LIBS removal
No functional change, this adds LIB definition and args to cmake files.
Without this it's difficult to migrate away from 'BLENDER_SORTED_LIBS'
since there are many platforms/configurations that could break when
changing linking order.
Manually add and enable WITHOUT_SORTED_LIBS to try building
without sorted libs (currently fails since all variables are empty).
This check will eventually be removed.
See T46725.
Diffstat (limited to 'intern/libmv/bundle.sh')
| -rwxr-xr-x | intern/libmv/bundle.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index 093095f5f5c..98a1e364634 100755 --- a/intern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -174,7 +174,7 @@ ${third_headers} if(WITH_GTESTS) - blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}") + blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "") ${tests} endif() @@ -184,5 +184,5 @@ else() ) endif() -blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}") +blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "") EOF |