diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:58:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:58:14 +0800 |
| commit | 6daacd94d1f53e53417ac24f05b983a2600a964f (patch) | |
| tree | e3727cfb28a5395128f9941afddf8a7098789709 /indra/llprimitive | |
| parent | 83c425fae25058b82d3ee8c8a4bcf10ebb4f5820 (diff) | |
| parent | 09a3bac9436af1b6077fb27885c8c6c645f40a8e (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 21d412baeb..b084098532 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -11,7 +11,7 @@ include(LLPrimitive) include(GLM) include(TinyGLTF) -if(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD ) +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( @@ -30,7 +30,7 @@ if(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD ) ${colladadom_SOURCE_DIR}/include/1.4 ) target_link_libraries( ll::colladadom INTERFACE collada14dom ) -endif(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD ) +endif () set(llprimitive_SOURCE_FILES lldaeloader.cpp |