diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-18 17:38:31 +0100 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-18 17:38:31 +0100 |
| commit | 4027486dbbe18c644eb679a49259ce201a5f9f59 (patch) | |
| tree | fe825f51fdd5a08e576ed9244ad95ed3ec4a05b0 | |
| parent | 92f1f7a525c3a550575050ca00b10924fdf4dce1 (diff) | |
storm-1831 Incorporating Oz's changes to update libxml on linux to libxml2
| -rwxr-xr-x | autobuild.xml | 10 | ||||
| -rwxr-xr-x | indra/cmake/GStreamer010Plugin.cmake | 4 | ||||
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 15 |
3 files changed, 19 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index b1478a46b2..53d79471ac 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1251,14 +1251,14 @@ </map> </map> </map> - <key>libxml</key> + <key>libxml2</key> <map> <key>license</key> <string>mit</string> <key>license_file</key> - <string>LICENSES/libxml.txt</string> + <string>LICENSES/libxml2.txt</string> <key>name</key> - <string>libxml</string> + <string>libxml2</string> <key>platforms</key> <map> <key>linux</key> @@ -1266,9 +1266,9 @@ <key>archive</key> <map> <key>hash</key> - <string>6414642528f42dac1cd9a012c99cd748</string> + <string>fd34e3e818ad7dd26add1f05e6069c11</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20101013.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libxml/rev/282218/arch/Linux/installer/libxml2-2.7.8-linux-20131009.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index d2d0699bcd..d1c99d5409 100755 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -8,8 +8,8 @@ if (STANDALONE) pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10) elseif (LINUX) use_prebuilt_binary(gstreamer) - # possible libxml should have its own .cmake file instead - use_prebuilt_binary(libxml) + # possible libxml2 should have its own .cmake file instead + use_prebuilt_binary(libxml2) set(GSTREAMER010_FOUND ON FORCE BOOL) set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL) set(GSTREAMER010_INCLUDE_DIRS diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 0d87ff579a..67c2115237 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -6,21 +6,30 @@ include(Boost) use_prebuilt_binary(colladadom) use_prebuilt_binary(pcre) -use_prebuilt_binary(libxml) set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) if (WINDOWS) - set(LLPRIMITIVE_LIBRARIES + set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive debug libcollada14dom22-d optimized libcollada14dom22 ${BOOST_SYSTEM_LIBRARIES} ) +elseif (LINUX) + use_prebuilt_binary(libxml2) + set(LLPRIMITIVE_LIBRARIES + llprimitive + collada14dom + minizip + xml2 + pcrecpp + pcre + ) else (WINDOWS) - set(LLPRIMITIVE_LIBRARIES + set(LLPRIMITIVE_LIBRARIES llprimitive collada14dom minizip |