diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:13:54 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:13:54 -0500 |
| commit | 1ca9c1dcfef3a935be30a5322c91d5e3df523a98 (patch) | |
| tree | 50aa5ccc5924d4296454dd3e8dcee7edddaf520b /indra/cmake | |
| parent | 1ae70e112a466a6ed5baf4e05c1771218c78b2f5 (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/APR.cmake | 9 | ||||
| -rw-r--r-- | indra/cmake/GStreamer010Plugin.cmake | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index f4706dd4f2..180504d286 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -54,7 +54,10 @@ else (STANDALONE) endif (WINDOWS) set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1) - if (LINUX AND VIEWER) - list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) - endif (LINUX AND VIEWER) + if (LINUX) + if (VIEWER) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) + endif (VIEWER) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt) + endif (LINUX) endif (STANDALONE) diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index 0d334837d4..0ca432da18 100644 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -24,7 +24,6 @@ elseif (LINUX) gmodule-2.0 dl gthread-2.0 - rt glib-2.0 ) endif (STANDALONE) |