diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-12 03:07:22 +0100 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-12 03:07:22 +0100 |
| commit | 015597bb5878fe3c2932fe96fdf2e6dbeee5519d (patch) | |
| tree | f01e620ff4b0e2048e7d8b5065e192f1c70a3496 /indra | |
| parent | 0c1d6d7d9e89a6d3169621157bcba335ead477a9 (diff) | |
STORM-1831 Importing Oz's updates for libxml2
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/GStreamer010Plugin.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index d2d0699bcd..8918ee0c90 100755 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -9,7 +9,7 @@ if (STANDALONE) elseif (LINUX) use_prebuilt_binary(gstreamer) # possible libxml should have its own .cmake file instead - use_prebuilt_binary(libxml) + 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..a9a8257f80 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -6,7 +6,6 @@ include(Boost) use_prebuilt_binary(colladadom) use_prebuilt_binary(pcre) -use_prebuilt_binary(libxml) set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive @@ -19,6 +18,16 @@ if (WINDOWS) 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 llprimitive |