Page MenuHome

CMake: initial replacement of sorted libs
AbandonedPublic

Authored by Campbell Barton (campbellbarton) on Apr 15 2019, 8:59 AM.

Details

Summary

The library lists have been committed to master, this patch now only removes SETUP_BLENDER_SORTED_LIBS.

Tested to work on Linux and macOS (win32 needs to be verified).

Diff Detail

Repository
rB Blender
Branch
temp-cmake-without-sorted-libs
Build Status
Buildable 3335
Build 3335: arc lint + arc unit

Event Timeline

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)
Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)
  • Merge branch 'master' into temp-cmake-without-sorted-libs
  • Cycles now works

It's not super happy on windows, with cycles turned off these are the main issues.

bf_blenkernel.lib
bf_draw.lib
bf_editor_gpencil.lib
bf_editor_interface.lib
bf_editor_screen.lib
bf_editor_sculpt_paint.lib
bf_editor_space_clip.lib
bf_editor_space_sequencer.lib
bf_editor_space_view3d.lib
bf_editor_uvedit.lib
bf_gpu.lib
bf_intern_ghost.lib
bf_intern_opencolorio.lib
bf_intern_opensubdiv.lib
bf_python_ext.lib
bf_python_gpu.lib
bf_windowmanager.lib
osdGPU_d.lib

all have a dependency on glew, adding ${BLENDER_GLEW_LIBRARIES} to any of them solves the linker issue for all (but don't think that's the way to go, since it just hides the dep issue for all others), a similar issue exists for a dependency on bf_intern_utfconv by bf_intern_ghost (and a few others, but haven't mapped those out yet) and bf_blenkernel depending on openvdb, there's a few others but these account for most of the linker noise.

  • Remove WITHOUT_SORTED_LIBS (prepare for enable by default)
  • Fixes for GTEST linking.
Harbormaster completed remote builds in B3335: Diff 14747.

@Ray Molenkamp (LazyDodo) thanks for testing, some of these issues showed up on brecht's system and have since been resolved.

Could you test again? (no CMakeCache.txt editing required now).