Merging r39998 through r40043 from trunk into soc-2011-tomato
[blender-staging.git] / CMakeLists.txt
index 42e4559cfb01f1f3af088de965488f6ee47af260..bea6f655235eeece9a0efd863fb71da6bc34c061 100644 (file)
@@ -455,15 +455,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()