[Bf-blender-cvs] [76a1d947449] temp-cmake-without-sorted-libs: Abbreviate library argument name

[Campbell Barton]

Commit: 76a1d947449bef60b6d10d3a2066dba45614938b
Author: Campbell Barton
Date:   Tue Apr 16 05:55:55 2019 +0200
Branches: temp-cmake-without-sorted-libs
https://developer.blender.org/rB76a1d947449bef60b6d10d3a2066dba45614938b

Abbreviate library argument name

===================================================================

M	build_files/cmake/macros.cmake
M	intern/cycles/cmake/macros.cmake

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 86ddc21bc97..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
-	library_dependencies
+	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 "${library_dependencies}" STREQUAL "")
-			target_link_libraries(${name} "${library_dependencies}")
+		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
-	library_dependencies
+	library_deps
 	)
 
 	add_cc_flags_custom_test(${name} PARENT_SCOPE)
 
-	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_dependencies}")
+	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
-	library_dependencies
+	library_deps
 	)
 
 	add_cc_flags_custom_test(${name} PARENT_SCOPE)
 
-	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_dependencies}")
+	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
 
 	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endfunction()
diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake
index 2f584576740..ed4c0e48c03 100644
--- a/intern/cycles/cmake/macros.cmake
+++ b/intern/cycles/cmake/macros.cmake
@@ -6,11 +6,11 @@ function(cycles_set_solution_folder target)
 	endif()
 endfunction()
 
-macro(cycles_add_library target library_dependencies)
+macro(cycles_add_library target library_deps)
 	add_library(${target} ${ARGN})
 	if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)
-		if(NOT ("${library_dependencies}" STREQUAL ""))
-			target_link_libraries(${target} "${library_dependencies}")
+		if(NOT ("${library_deps}" STREQUAL ""))
+			target_link_libraries(${target} "${library_deps}")
 		endif()
 	endif()
 	cycles_set_solution_folder(${target})