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. --- extern/gflags/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'extern/gflags') diff --git a/extern/gflags/CMakeLists.txt b/extern/gflags/CMakeLists.txt index da24e5504a3..13c3a2a03a9 100644 --- a/extern/gflags/CMakeLists.txt +++ b/extern/gflags/CMakeLists.txt @@ -40,6 +40,9 @@ set(SRC src/util.h ) +set(LIB +) + if(WIN32) list(APPEND SRC src/windows_port.cc @@ -49,4 +52,4 @@ endif() add_definitions(${GFLAGS_DEFINES}) -blender_add_lib(extern_gflags "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_gflags "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -- cgit v1.2.3