diff options
author | Aleric Inglewood | 2010-09-30 02:39:58 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-09-30 02:39:58 +0200 |
commit | c6743de7831a1c4705831d2f43b2cc363646d657 (patch) | |
tree | cf98677f75e97a0486907a0190c9ecbacf955491 /linden/indra/newview/CMakeLists.txt | |
parent | SNOW-86: Dangerous macro leads to possible wrong code (diff) | |
download | meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.zip meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.tar.gz meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.tar.bz2 meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.tar.xz |
VWR-14426: Link step fails on Linux when LDFLAGS is set
See http://redmine.imprudenceviewer.org/issues/572
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 901cfeb..dc0cf69 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
@@ -992,7 +992,7 @@ endif (DARWIN) | |||
992 | 992 | ||
993 | if (LINUX) | 993 | if (LINUX) |
994 | LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) | 994 | LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) |
995 | LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed) | 995 | SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") |
996 | 996 | ||
997 | set(viewer_LIBRARIES | 997 | set(viewer_LIBRARIES |
998 | Xinerama | 998 | Xinerama |