From 31c2e69d49315717b522bca5a1fb48c05b1b86fa Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 12:36:44 +0200 Subject: CMake: remove BLENDER_SORTED_LIBS Use CMake's target_link_libraries instead of manually maintaining library dependencies in a single list. In practice adding new libraries often ended up being guess-work, now each library lists the libraries it uses. This was used for the game player executable so libraries could optionally link to stubs. If we need this functionality it can be done using target-properties as described in T46725. --- intern/cycles/cmake/macros.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'intern') diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index ed4c0e48c03..ab8182ba4a7 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -8,10 +8,8 @@ endfunction() macro(cycles_add_library target library_deps) add_library(${target} ${ARGN}) - if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS) - if(NOT ("${library_deps}" STREQUAL "")) - target_link_libraries(${target} "${library_deps}") - endif() + if(NOT ("${library_deps}" STREQUAL "")) + target_link_libraries(${target} "${library_deps}") endif() cycles_set_solution_folder(${target}) endmacro() -- cgit v1.2.3