diff options
| author | callum_linden <none@none> | 2014-10-10 14:49:48 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-10 14:49:48 -0700 |
| commit | 4fb1bae807a5dd8a342946b8f23d2a7a5aa5d36a (patch) | |
| tree | 06747807e63396841b82ce82c788faf7a5548598 /indra/cmake | |
| parent | 92bad5c87f42b55f6b1693c7de7e70eb77ab2f17 (diff) | |
update autobuild.xml to point to new versions of boost, googlemock and colladadom
Diffstat (limited to 'indra/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) |