From 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 12 Aug 2008 17:29:50 +0000
Subject: QAR-767 Combined maint-render-7 and maint-viewer-9 merge merge
 release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated

---
 indra/cmake/00-Common.cmake | 5 +++++
 indra/cmake/ELFIO.cmake     | 1 +
 2 files changed, 6 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index d404150bfd..1d697deeae 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -146,6 +146,11 @@ if (LINUX)
 
   if (VIEWER)
     add_definitions(-DAPPID=secondlife)
+    add_definitions(-fvisibility=hidden)
+    if (NOT STANDALONE)
+      # this stops us requiring a really recent glibc at runtime
+      add_definitions(-fno-stack-protector)
+    endif (NOT STANDALONE)
   endif (VIEWER)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake
index e420ce27bb..e51993b0f7 100644
--- a/indra/cmake/ELFIO.cmake
+++ b/indra/cmake/ELFIO.cmake
@@ -9,6 +9,7 @@ elseif (LINUX)
   use_prebuilt_binary(elfio)
   set(ELFIO_LIBRARIES ELFIO)
   set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+  set(ELFIO_FOUND "YES")
 endif (STANDALONE)
 
 if (ELFIO_FOUND)
-- 
cgit v1.2.3