diff options
| author | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
| commit | 03c738d0c9df57a786803a292bc766e78d014749 (patch) | |
| tree | 08c8e8529056d12240fa4e71987b54c2ce28d2f4 /indra/cmake/GoogleMock.cmake | |
| parent | d8e04b9d31b0c77289f5f770f2a9b54506650151 (diff) | |
| parent | 3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (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) |