From 6790dbe9dbafea549ed0e6cc107a57649cae2e29 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 19 Jun 2011 13:06:21 +0000
Subject: cmake: fix for recent break in msvc+collada, also dont cache
 duplicate python include/library variables.

---
 CMakeLists.txt | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 513211a07da..c58ff1f4ed8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -608,13 +608,24 @@ elseif(WIN32)
 		endif()
 
 		if(WITH_OPENCOLLADA)
-			set(OPENCOLLADA ${LIBDIR}/opencollada)
-			set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
-			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-			set(OPENCOLLADA_LIBRARIES OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
+			set(OPENCOLLADA_INCLUDE_DIR
+				${LIBDIR}/opencollada/include
+			)
+			set(OPENCOLLADA_LIBRARIES
+				${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
+				${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
+				${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
+				${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
+				${LIBDIR}/opencollada/lib/MathMLSolver.lib
+				${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
+				${LIBDIR}/opencollada/lib/xml2.lib
+				${LIBDIR}/opencollada/lib/buffer.lib
+				${LIBDIR}/opencollada/lib/ftoa.lib
+				${LIBDIR}/opencollada/lib/UTF.lib
+			)
 			set(PCRE_LIB pcre)
 		endif()
-	
+
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/msvc)
-- 
cgit v1.2.3