diff options
Diffstat (limited to 'indra/cmake/GoogleMock.cmake')
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/GoogleMock.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake index ca5a8034ba..5a00546927 100644..100755 --- a/indra/cmake/GoogleMock.cmake +++ b/indra/cmake/GoogleMock.cmake @@ -4,17 +4,18 @@ include(Linking) use_prebuilt_binary(googlemock) -set(GOOGLEMOCK_INCLUDE_DIRS +set(GOOGLEMOCK_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (LINUX) - set(GOOGLEMOCK_LIBRARIES - gmock - gtest) + # VWR-24366: gmock is underlinked, it needs gtest. + set(GOOGLEMOCK_LIBRARIES + gmock -Wl,--no-as-needed + gtest -Wl,--as-needed) elseif(WINDOWS) - set(GOOGLEMOCK_LIBRARIES + set(GOOGLEMOCK_LIBRARIES gmock) - set(GOOGLEMOCK_INCLUDE_DIRS + set(GOOGLEMOCK_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/include/gmock ${LIBS_PREBUILT_DIR}/include/gmock/boost/tr1/tr1) |