diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
| commit | 4cf12a6d223a238ff30f8b334ca91836c7369f88 (patch) | |
| tree | a2bf8fa27e5fff8a1b8a75cdb5d835f4e959f145 /indra/cmake/LLAddBuildTest.cmake | |
| parent | 13f24f2419edeefbda8bedab01fad21cb97b7445 (diff) | |
| parent | 569d97707459d5f87cb04a0811c0b7eb1b5c2251 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/cmake/LLAddBuildTest.cmake')
| -rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 2172b56da2..5d96a4398f 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -1,7 +1,13 @@ # -*- cmake -*- + +include_guard() + +if( NOT LL_TESTS ) + return() +endif() + include(00-Common) include(LLTestCommand) -include(GoogleMock) include(bugsplat) include(Tut) @@ -19,10 +25,6 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources) # # More info and examples at: https://wiki.secondlife.com/wiki/How_to_add_unit_tests_to_indra_code - # This here looks weird, but is needed. It will inject GoogleMock into projects that forgot to include `this` (LLAddBuildTest.cmake) - # But through some other means have access to this macro - include(GoogleMock) - if(LL_TEST_VERBOSE) message("LL_ADD_PROJECT_UNIT_TESTS UNITTEST_PROJECT_${project} sources: ${sources}") endif() @@ -41,7 +43,6 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources) set(alltest_LIBRARIES llcommon - ll::googlemock ) if(NOT "${project}" STREQUAL "llmath") # add llmath as a dep unless the tested module *is* llmath! @@ -204,7 +205,6 @@ FUNCTION(LL_ADD_INTEGRATION_TEST set(libraries ${library_dependencies} - ll::googlemock ) # Add test executable build target |