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/cycles/blender | |
| 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/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index f8720de366f..3f8868d793b 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -38,6 +38,9 @@ set(SRC blender_util.h ) +set(LIB +) + set(ADDON_FILES addon/__init__.py addon/engine.py @@ -59,7 +62,7 @@ if(WITH_CYCLES_NETWORK) add_definitions(-DWITH_NETWORK) endif() -blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # avoid link failure with clang 3.4 debug if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4') |