diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 14:29:56 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 14:29:56 +0000 |
| commit | 221885fc73c29cfc8600c9f892d19ca068e886b0 (patch) | |
| tree | 5bfd8605d724ca411eaa23855ae29930914bac5a /indra | |
| parent | c3bd736f6c2d51542fb2894542151282144e7388 (diff) | |
Hack librt inclusion into llcommon for all Linux builds. The dep is needed for llcommon, but it was being satisfied elsewhere for viewer builds and got to dodge the problem. This should quieten the server builds somewhat.
Diffstat (limited to 'indra')
| -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..9d1269b33d 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 rt) + 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) |