diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 12:03:31 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 12:03:31 +0300 |
| commit | 89321a56fd95ade557be41a07e1b3deaa6162281 (patch) | |
| tree | 0eee17609e3c72cdc5319f7ee9725214588baf72 /indra/cmake/GoogleMock.cmake | |
| parent | b2200f06dacfde4fe62a8f7f252e941c65d71c72 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
increment viewer version to 3.7.29
Diffstat (limited to 'indra/cmake/GoogleMock.cmake')
| -rwxr-xr-x | indra/cmake/GoogleMock.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake index cac072988e..5a00546927 100755 --- a/indra/cmake/GoogleMock.cmake +++ b/indra/cmake/GoogleMock.cmake @@ -2,20 +2,20 @@ include(Prebuilt) include(Linking) -use_prebuilt_binary(gmock) +use_prebuilt_binary(googlemock) -set(GOOGLEMOCK_INCLUDE_DIRS +set(GOOGLEMOCK_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (LINUX) # VWR-24366: gmock is underlinked, it needs gtest. - set(GOOGLEMOCK_LIBRARIES + 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) |