From 47adab4f993e66328bd1ad97abaf6697784ee8a0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 14 Apr 2019 15:18:44 +0200 Subject: 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. --- source/creator/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 812715ca042..e4045d0b77c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1022,7 +1022,11 @@ install( add_dependencies(blender makesdna) -setup_blender_sorted_libs() +# Use for testing 'BLENDER_SORTED_LIBS' removal. +if(NOT (DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)) + setup_blender_sorted_libs() +endif() + target_link_libraries(blender ${BLENDER_SORTED_LIBS}) setup_liblinks(blender) -- cgit v1.2.3