patch from Uncle_Entity on IRC for fedora/collada

2011-09-08 03:57:11 +00:00
parent 5a900be4d6
commit c61827ed25
4 changed files with 157 additions and 12 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -452,15 +452,8 @@ if(UNIX AND NOT APPLE)
 	if(WITH_OPENCOLLADA)
 		find_package(OpenCOLLADA)
 		if(OPENCOLLADA_FOUND)
-			set(PCRE /usr CACHE PATH "PCRE Directory")
-			mark_as_advanced(PCRE)
-			set(PCRE_LIBPATH ${PCRE}/lib)
-			set(PCRE_LIB pcre)
-
-			set(EXPAT /usr CACHE PATH "Expat Directory")
-			mark_as_advanced(EXPAT)
-			set(EXPAT_LIBPATH ${EXPAT}/lib)
-			set(EXPAT_LIB expat)
+			find_package(XML2)
+			find_package(PCRE)
 		else()
 			set(WITH_OPENCOLLADA OFF)
 		endif()