diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-11-07 14:54:52 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-11-07 14:54:52 +0800 |
| commit | 1aa0ec2e5847a9d211a3d944284c91a8326eca1f (patch) | |
| tree | 0e0095ad019bc6b47bef0ea3b32dfe9a74f99bda /indra/llprimitive | |
| parent | d1e66eca33c42f6100644f08072c9f6b025a01b9 (diff) | |
Update the upstream ColladaDOM revision used to 10
As the maintenance using an external patch is getting harder, I had
to revert the patching to internal and the building to be in the
configuration phase, made worse by CMake 4 on Arch, Gentoo and
Tumbleweed that treats the absence of a minimum requirement as an
error (the BSD sed condition is put there as an anticipation for
when in the future (Mac)Ports' CMake gets updated to 4 too).
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index b084098532..82b3b37824 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -3,7 +3,6 @@ project(llprimitive) include(00-Common) -include(Prebuilt) include(LLCommon) include(LLCoreHttp) include(LLPhysicsExtensions) @@ -11,27 +10,6 @@ include(LLPrimitive) include(GLM) include(TinyGLTF) -if (LINUX AND NOT (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) - set_property(DIRECTORY APPEND - PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/../patches/collada-dom-v2.3-r8.patch) - prepare_thirdparty( - "https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r8.tar.gz" - "colladadom-v2.3-r8.tar.gz" - "3p-colladadom-2.3-r8" - "collada-dom-v2.3-r8.patch" - "b36dce3b7be4b49f3c8e4d6c9dbf3529f7ed1f28e64ee45be0e77805f06376b95079798616529302d771ab2b76bf06d2f894ca11e6f7f3097c3f7a05a78c474f" - ) - set(OPT_COLLADA14 TRUE) - add_subdirectory( - "${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8" "colladadom") - target_include_directories( - ll::colladadom INTERFACE - ${colladadom_SOURCE_DIR}/include - ${colladadom_SOURCE_DIR}/include/1.4 - ) - target_link_libraries( ll::colladadom INTERFACE collada14dom ) -endif () - set(llprimitive_SOURCE_FILES lldaeloader.cpp llgltfmaterial.cpp |