diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-03-29 17:05:40 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-03-30 13:46:00 -0700 |
| commit | 1b6cd23abdc9e5208076d55cce9f06bc2a0713a1 (patch) | |
| tree | 43cbe646c0b3a03eba30147227ce7762ac89da08 /indra/llprimitive | |
| parent | a548c169899734b7d6af1a1870dab1ad1eb74e3c (diff) | |
CMake and tests fixups after merge with main for DRTVWR-559
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index f8f55759ae..76d261ab3e 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -7,11 +7,8 @@ include(LLCommon) include(LLCoreHttp) include(LLPhysicsExtensions) include(LLPrimitive) -include(LLRender) include(GLH) include(TinyGLTF) - ${LLRENDER_INCLUDE_DIRS} - ${TINYGLTF_INCLUDE_DIR} set(llprimitive_SOURCE_FILES lldaeloader.cpp @@ -68,6 +65,7 @@ target_link_libraries(llprimitive llcorehttp llxml llcharacter + llrender llphysicsextensions_impl ll::colladadom ll::pcre @@ -82,6 +80,7 @@ if (LL_TESTS) llprimitive.cpp llgltfmaterial.cpp ) - + + set_property(SOURCE llprimitive.cpp PROPERTY LL_TEST_ADDITIONAL_LIBRARIES llmessage) LL_ADD_PROJECT_UNIT_TESTS(llprimitive "${llprimitive_TEST_SOURCE_FILES}") endif (LL_TESTS) |