From 418bce934129bacdee30a3cbffa47e7d299bd3ff Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 25 Jun 2011 14:10:46 +0000
Subject: [PATCH] fix for building with MSVC release, some edits I made didnt
 work as I expected but still built for debug

---
 build_files/cmake/macros.cmake | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index bb3761d4539..1800c4eb826 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -202,9 +202,8 @@ macro(setup_liblinks
 
 		if(WIN32 AND NOT UNIX)
 			file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
-			target_link_libraries(${target}
-					debug ${PYTHON_LIBRARIES_DEBUG}
-					optimized ${PYTHON_LIBRARIES})
+			target_link_libraries(${target} debug ${PYTHON_LIBRARIES_DEBUG})
+			target_link_libraries(${target} optimized ${PYTHON_LIBRARIES})
 			unset(PYTHON_LIBRARIES_DEBUG)
 		else()
 			target_link_libraries(${target} ${PYTHON_LIBRARIES})
@@ -257,9 +256,8 @@ macro(setup_liblinks
 	if(WITH_IMAGE_OPENEXR)
 		if(WIN32 AND NOT UNIX)
 			file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")
-			target_link_libraries(${target}
-					debug ${OPENEXR_LIBRARIES_DEBUG}
-					optimized ${OPENEXR_LIBRARIES})
+			target_link_libraries(${target} debug ${OPENEXR_LIBRARIES_DEBUG})
+			target_link_libraries(${target} optimized ${OPENEXR_LIBRARIES})
 			unset(OPENEXR_LIBRARIES_DEBUG)
 		else()
 			target_link_libraries(${target} ${OPENEXR_LIBRARIES})
@@ -274,22 +272,19 @@ macro(setup_liblinks
 	if(WITH_OPENCOLLADA)
 		if(WIN32 AND NOT UNIX)
 			file_list_suffix(OPENCOLLADA_LIBRARIES_DEBUG "${OPENCOLLADA_LIBRARIES}" "_d")
-			target_link_libraries(${target}
-					debug ${OPENCOLLADA_LIBRARIES_DEBUG}
-					optimized ${OPENCOLLADA_LIBRARIES})
+			target_link_libraries(${target} debug ${OPENCOLLADA_LIBRARIES_DEBUG})
+			target_link_libraries(${target} optimized ${OPENCOLLADA_LIBRARIES})
 			unset(OPENCOLLADA_LIBRARIES_DEBUG)
 
 			file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d")
-			target_link_libraries(${target}
-					debug ${PCRE_LIB_DEBUG}
-					optimized ${PCRE_LIB})
+			target_link_libraries(${target} debug ${PCRE_LIB_DEBUG})
+			target_link_libraries(${target} optimized ${PCRE_LIB})
 			unset(PCRE_LIB_DEBUG)
 
 			if(EXPAT_LIB)
 				file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d")
-				target_link_libraries(${target}
-						debug ${EXPAT_LIB_DEBUG}
-						optimized ${EXPAT_LIB})
+				target_link_libraries(${target} debug ${EXPAT_LIB_DEBUG})
+				target_link_libraries(${target} optimized ${EXPAT_LIB})
 				unset(EXPAT_LIB_DEBUG)
 			endif()
 		else()