diff options
| author | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
| commit | 70aff7fd157b1e2894a4d065caf9a63848d072b0 (patch) | |
| tree | dee262d1b7ac3ef14eebeb71d55e9b0755209148 /indra/cmake/GoogleMock.cmake | |
| parent | 64e672d9d92d1b8f92e968b0164b2212a71120da (diff) | |
| parent | 378585e7f089b62b7a0dd69adde48cd63fc7bacc (diff) | |
Merge
Diffstat (limited to 'indra/cmake/GoogleMock.cmake')
| -rw-r--r-- | indra/cmake/GoogleMock.cmake | 5 |
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) |