From 297f14a1d623832f4d77ca0740f3ce4bad7fe767 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 12 Sep 2011 13:58:13 +0000
Subject: [PATCH] fix for error linking opencollada on linux.

---
 CMakeLists.txt                 |  6 +++---
 build_files/cmake/macros.cmake | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea89cbddb9f..6eb8b8c0853 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -702,7 +702,7 @@ elseif(WIN32)
 				${LIBDIR}/opencollada/lib/ftoa.lib
 				${LIBDIR}/opencollada/lib/UTF.lib
 			)
-			set(PCRE_LIB
+			set(PCRE_LIBRARIES
 				${LIBDIR}/opencollada/lib/pcre.lib
 			)
 		endif()
@@ -844,7 +844,7 @@ elseif(WIN32)
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
-			set(PCRE_LIB pcre)
+			set(PCRE_LIBRARIES pcre)
 		endif()
 		
 		if(WITH_CODEC_FFMPEG)
@@ -1066,7 +1066,7 @@ elseif(APPLE)
 		#pcre is bundled with openCollada
 		#set(PCRE ${LIBDIR}/pcre)
 		#set(PCRE_LIBPATH ${PCRE}/lib)
-		set(PCRE_LIB pcre)
+		set(PCRE_LIBRARIES pcre)
 		#libxml2 is used
 		#set(EXPAT ${LIBDIR}/expat)
 		#set(EXPAT_LIBPATH ${EXPAT}/lib)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index d09215d040d..aec7a9fd96c 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -295,10 +295,10 @@ macro(setup_liblinks
 			target_link_libraries_optimized(${target} "${OPENCOLLADA_LIBRARIES}")
 			unset(OPENCOLLADA_LIBRARIES_DEBUG)
 
-			file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d")
-			target_link_libraries_debug(${target} "${PCRE_LIB_DEBUG}")
-			target_link_libraries_optimized(${target} "${PCRE_LIB}")
-			unset(PCRE_LIB_DEBUG)
+			file_list_suffix(PCRE_LIBRARIES_DEBUG "${PCRE_LIBRARIES}" "_d")
+			target_link_libraries_debug(${target} "${PCRE_LIBRARIES_DEBUG}")
+			target_link_libraries_optimized(${target} "${PCRE_LIBRARIES}")
+			unset(PCRE_LIBRARIES_DEBUG)
 
 			if(EXPAT_LIB)
 				file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d")
@@ -309,7 +309,8 @@ macro(setup_liblinks
 		else()
 			target_link_libraries(${target}
 					${OPENCOLLADA_LIBRARIES}
-					${PCRE_LIB}
+					${PCRE_LIBRARIES}
+					${XML2_LIBRARIES}
 					${EXPAT_LIB})
 		endif()
 	endif()