diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-21 04:21:00 +0100 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-21 04:21:00 +0100 |
| commit | 30f835809bc736351f0134dfefefbdcdcbdc9948 (patch) | |
| tree | 39f20a7defa9de67d1e604bd527f55a37e48f52b /indra/cmake | |
| parent | 79645e6981a97224024c5226d8713dce9569d54a (diff) | |
| parent | 37b705c96264ed28896d687e565d1112939e9123 (diff) | |
Merge 3.5.8-release
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/GStreamer010Plugin.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index 8918ee0c90..d1c99d5409 100755 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -8,7 +8,7 @@ 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 + # 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) diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index a9a8257f80..67c2115237 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -11,7 +11,7 @@ set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) if (WINDOWS) - set(LLPRIMITIVE_LIBRARIES + set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive debug libcollada14dom22-d @@ -29,7 +29,7 @@ elseif (LINUX) pcre ) else (WINDOWS) - set(LLPRIMITIVE_LIBRARIES + set(LLPRIMITIVE_LIBRARIES llprimitive collada14dom minizip |