From 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 06:11:27 +0200 Subject: CMake: cleanup, arg rename, add definitions last --- build_files/cmake/macros.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'build_files/cmake/macros.cmake') diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c0340427d95..0da4a4a1bf9 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -222,7 +222,7 @@ function(blender_add_lib__impl sources includes includes_sys - libraries + library_deps ) # message(STATUS "Configuring library ${name}") @@ -236,8 +236,8 @@ function(blender_add_lib__impl # Use for testing 'BLENDER_SORTED_LIBS' removal. if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS) - if (NOT "${libraries}" STREQUAL "") - target_link_libraries(${name} "${libraries}") + if (NOT "${library_deps}" STREQUAL "") + target_link_libraries(${name} "${library_deps}") endif() endif() @@ -265,12 +265,12 @@ function(blender_add_lib_nolist sources includes includes_sys - libraries + library_deps ) add_cc_flags_custom_test(${name} PARENT_SCOPE) - blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}") + blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}") endfunction() function(blender_add_lib @@ -278,12 +278,12 @@ function(blender_add_lib sources includes includes_sys - libraries + library_deps ) add_cc_flags_custom_test(${name} PARENT_SCOPE) - blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}") + blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}") set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name}) endfunction() -- cgit v1.2.3