diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/GoogleMock.cmake | 12 | ||||
| -rw-r--r-- | indra/cmake/Hunspell.cmake | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake index 753b972e95..e4520fe96e 100644 --- a/indra/cmake/GoogleMock.cmake +++ b/indra/cmake/GoogleMock.cmake @@ -4,16 +4,18 @@ include(Linking) include_guard() +add_library( ll::googlemock INTERFACE IMPORTED ) if(USE_CONAN) - return() + target_link_libraries( ll::googlemock INTERFACE CONAN_PKG::gtest ) + + #Not very nice, but for the moment we need this for tut.hpp + target_include_directories( ll::googlemock SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) + return() endif() -add_library( ll::googlemock INTERFACE IMPORTED ) use_prebuilt_binary(googlemock) -target_include_directories( ll::googlemock SYSTEM INTERFACE - ${LIBS_PREBUILT_DIR}/include - ) +target_include_directories( ll::googlemock SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) if (LINUX) # VWR-24366: gmock is underlinked, it needs gtest. diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index c372d83f8d..6e92611cc9 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -2,6 +2,8 @@ include(Prebuilt) include_guard() +use_prebuilt_binary(dictionaries) + add_library( ll::hunspell INTERFACE IMPORTED ) use_conan_binary(hunspell) use_prebuilt_binary(libhunspell) @@ -13,4 +15,3 @@ elseif(LINUX) target_link_libraries( ll::hunspell INTERFACE hunspell-1.3) endif() target_include_directories( ll::hunspell SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/hunspell) -use_prebuilt_binary(dictionaries) |