diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
| commit | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (patch) | |
| tree | 55de3117a3937e6258f586fd7a5a5ad294819920 /indra/cmake/GoogleMock.cmake | |
| parent | 10cf492ef1730e869389b704345a6604ed363427 (diff) | |
| parent | eacd9d5d590069b56ae3497a3830c5e299475a4a (diff) | |
merge changes for storm-937
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) |