summaryrefslogtreecommitdiff
path: root/indra/cmake/GoogleMock.cmake
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-02-17 12:14:32 -0800
committerTofu Buzzard <no-email>2011-02-17 12:14:32 -0800
commit3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (patch)
tree4fd4be7a8e52b0e746468fd8822db8dab9c4861d /indra/cmake/GoogleMock.cmake
parent8921bdf0577c1282d5aa9cd920f0b57b77d95682 (diff)
parent0ba198b94b85979bc970f2fcabf9df652d94e669 (diff)
merge
Diffstat (limited to 'indra/cmake/GoogleMock.cmake')
-rw-r--r--indra/cmake/GoogleMock.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
index ca5a8034ba..06d6d847a0 100644
--- a/indra/cmake/GoogleMock.cmake
+++ b/indra/cmake/GoogleMock.cmake
@@ -8,9 +8,10 @@ set(GOOGLEMOCK_INCLUDE_DIRS
${LIBS_PREBUILT_DIR}/include)
if (LINUX)
+ # VWR-24366: gmock is underlinked, it needs gtest.
set(GOOGLEMOCK_LIBRARIES
- gmock
- gtest)
+ gmock -Wl,--no-as-needed
+ gtest -Wl,--as-needed)
elseif(WINDOWS)
set(GOOGLEMOCK_LIBRARIES
gmock)