[Bf-blender-cvs] [0dcda51] master: Revert "Correct recent commit replacing macro's /w MSVC"

Campbell Barton noreply at git.blender.org
Wed Jun 17 17:03:34 CEST 2015


Commit: 0dcda5183631ffedeb664459b017e8cd0ddfacaf
Author: Campbell Barton
Date:   Thu Jun 18 00:53:04 2015 +1000
Branches: master
https://developer.blender.org/rB0dcda5183631ffedeb664459b017e8cd0ddfacaf

Revert "Correct recent commit replacing macro's /w MSVC"

This reverts commit 810f8928d65abbce6dddc1e11f6092c22d9a5fcc.

Worked by accident with MSVC, real fix next...

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 04be244..2cc57f6 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -134,9 +134,9 @@ function(target_link_libraries_decoupled
 	else()
 		# For MSVC we link to different libraries depending whether
 		# release or debug target is being built.
-		file_list_suffix(_libraries_debug "${${${libraries_var}}}" "_d")
-		target_link_libraries_debug(${target} "${${_libraries_debug}}")
-		target_link_libraries_optimized(${target} "${${${libraries_var}}}")
+		file_list_suffix(_libraries_debug "${${libraries_var}}" "_d")
+		target_link_libraries_debug(${target} "${_libraries_debug}")
+		target_link_libraries_optimized(${target} "${${libraries_var}}")
 	endif()
 endfunction()




More information about the Bf-blender-cvs mailing list