diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-06-03 10:15:56 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-06-08 13:33:59 -0600 |
| commit | 2dc376aa5324448de7d15717d5e24b812d885eea (patch) | |
| tree | 81d0a0930cd8acac2e74211e9f59afef941298da /indra | |
| parent | c9ebb970ee916ace16e88508dc1a178336a91d52 (diff) | |
SL-17214 add 3p-tinygltf dependency to autobuild.xml
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/TinyGLTF.cmake | 7 | ||||
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/cmake/TinyGLTF.cmake b/indra/cmake/TinyGLTF.cmake new file mode 100644 index 0000000000..bb731637a0 --- /dev/null +++ b/indra/cmake/TinyGLTF.cmake @@ -0,0 +1,7 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(tinygltf) + +set(TINYGLTF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinygltf) + diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 2395841eae..e131b12371 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -11,6 +11,7 @@ include(LLXML) include(LLPhysicsExtensions) include(LLCharacter) include(LLRender) +include(TinyGLTF) include_directories( ${LLCOMMON_INCLUDE_DIRS} @@ -21,6 +22,7 @@ include_directories( ${LIBS_PREBUILT_DIR}/include/collada ${LIBS_PREBUILT_DIR}/include/collada/1.4 ${LLCHARACTER_INCLUDE_DIRS} + ${TINYGLTF_INCLUDE_DIR} ) include_directories(SYSTEM ${LLCOMMON_SYSTEM_INCLUDE_DIRS} |