[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37637] trunk/blender: cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.

[Campbell Barton]

Revision: 37637
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37637
Author:   campbellbarton
Date:     2011-06-19 13:06:21 +0000 (Sun, 19 Jun 2011)
Log Message:
-----------
cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-06-19 11:04:15 UTC (rev 37636)
+++ trunk/blender/CMakeLists.txt	2011-06-19 13:06:21 UTC (rev 37637)
@@ -608,13 +608,24 @@
 		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)

Modified: trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-06-19 11:04:15 UTC (rev 37636)
+++ trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-06-19 13:06:21 UTC (rev 37637)
@@ -77,8 +77,8 @@
 
 if(PYTHONLIBSUNIX_FOUND)
 	# Assign cache items
-	set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} CACHE STRING "")
-	set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} CACHE STRING "")
+	set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+	set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
 
 	# we need this for installation
 	get_filename_component(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
@@ -87,10 +87,7 @@
 	# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
 
 	mark_as_advanced(
-		PYTHON_INCLUDE_DIRS
 		PYTHON_INCLUDE_DIR
-		PYTHON_LIBRARIES
 		PYTHON_LIBRARY
-		PYTHON_LIBPATH
 	)
 endif()