File blender-2.59-colladainclude.patch of Package blender

Overview Repositories Revisions Requests Users Attributes Meta

File blender-2.59-colladainclude.patch of Package blender (Revision 7a61156ca91889a788d59cb9d7550085)

Currently displaying revision 7a61156ca91889a788d59cb9d7550085 , Show latest

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig	2011-09-07 17:32:37.000000000 +0200
+++ CMakeLists.txt	2011-09-07 17:40:08.639995773 +0200
@@ -429,11 +429,12 @@ if(UNIX AND NOT APPLE)
 	endif()
 
 	if(WITH_OPENCOLLADA)
-		set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
+		set(OPENCOLLADA /usr CACHE PATH "OpenCollada Directory")
 		mark_as_advanced(OPENCOLLADA)
-		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA_LIB})
+		mark_as_advanced(OPENCOLLADA_LIBPATH)
 		set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver pcre xml2)
-		set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
+		set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
 
 		set(PCRE /usr CACHE PATH "PCRE Directory")
 		mark_as_advanced(PCRE)
@@ -676,7 +677,6 @@ elseif(WIN32)
 				${LIBDIR}/opencollada/lib/MathMLSolver.lib
 				${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
 				${LIBDIR}/opencollada/lib/xml2.lib
-				
 			)
 			set(PCRE_LIB
 				${LIBDIR}/opencollada/lib/pcre.lib

Places

File blender-2.59-colladainclude.patch of Package blender (Revision 7a61156ca91889a788d59cb9d7550085)

Places