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/cmake/OpenJPEG.cmake | |
| parent | 83c425fae25058b82d3ee8c8a4bcf10ebb4f5820 (diff) | |
| parent | 09a3bac9436af1b6077fb27885c8c6c645f40a8e (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/cmake/OpenJPEG.cmake')
| -rw-r--r-- | indra/cmake/OpenJPEG.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 5729f6a10e..94dcde0d5c 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -19,7 +19,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN DESTINATION ${CMAKE_BINARY_DIR} ) - if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) + if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR (${LINUX_DISTRO} MATCHES ubuntu)) try_compile(OPENJPEG_RESULT PROJECT OPENJPEG SOURCE_DIR ${CMAKE_BINARY_DIR}/openjpeg-2.5.3 @@ -61,7 +61,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN file(WRITE ${PREBUILD_TRACKING_DIR}/openjpeg_installed "${openjpeg_installed}") endif () -if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) +if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR (${LINUX_DISTRO} MATCHES ubuntu)) target_link_libraries(ll::openjpeg INTERFACE openjp2 ) else () include(FindPkgConfig) |