diff options
| author | Hiroo Ono <hiroo.ono@gmail.com> | 2024-09-01 21:17:05 +0900 |
|---|---|---|
| committer | Hiroo Ono <hiroo.ono@gmail.com> | 2024-09-01 21:17:05 +0900 |
| commit | ea9ff01bbc249751f7366607d796353784daaf69 (patch) | |
| tree | 3051e8c5fe54404e26f9b1e683a68661a76bcbc0 /indra/llprimitive | |
| parent | 08113620404175754e5154c90c743f3c9b1330b8 (diff) | |
Build and link collada-dom v2.3-r7 taken from Linden Lab's 3rd party software
repository.
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 985c15b99f..19bae2112b 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -3,7 +3,7 @@ project(llprimitive) include(00-Common) -include(DepsBuild) +include(Prebuilt) include(LLCommon) include(LLCoreHttp) include(LLPhysicsExtensions) @@ -13,12 +13,16 @@ include(GLM) include(TinyGLTF) if(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD ) - checkout_deps_repository( - "https://github.com/oikumene/3p-colladadom-test.git" - "collada-dom" "v2.3-r7-megapahit" + prepare_thirdparty( + "https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r7.tar.gz" + "colladadom-v2.3-r7.tar.gz" + "3p-colladadom-2.3-r7" + "collada-dom-v2.3-r7.patch" + "0d7a13531eb0de8c617b48af90c3b5b22c2a0b566069d1a0c36f9602dbfeb9ebab1516556e6dda34645d63354c3c6539375d7e5b8c0b36baba11312d18a3c705" ) set(OPT_COLLADA14 TRUE) - add_subdirectory(${CMAKE_SOURCE_DIR}/../../collada-dom "collada-dom") + add_subdirectory( + "${CMAKE_SOURCE_DIR}/../../3p-colladadom-2.3-r7" "colladadom") target_include_directories( ll::colladadom INTERFACE ${colladadom_SOURCE_DIR}/include |