diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-14 22:32:48 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-14 22:32:48 +0800 |
| commit | adcb9165ff6dced01f74076233568e13b149dcf7 (patch) | |
| tree | 110669f3436ac0e8fdb72dbeece8ad4d05fe098c /indra | |
| parent | 8656b71605d0feb5cc89b80c4044b74d4bfb42a0 (diff) | |
| parent | 99f771e1ce4d50a8aff39c79c82d699570d5da67 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra')
| -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 d2c9d95c9b..579fd87a45 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -43,12 +43,12 @@ if (USESYSTEMLIBS AND (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR CMAKE_SYSTEM_ endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/openjpeg_installed OR NOT ${openjpeg_installed} EQUAL 0) else (USESYSTEMLIBS AND (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)) use_prebuilt_binary(openjpeg) - if (EXISTS ${LIBS_PREBUILT_DIR}/include/openjpeg) + if (NOT EXISTS ${LIBS_PREBUILT_DIR}/include/openjpeg-2.5) file(RENAME ${LIBS_PREBUILT_DIR}/include/openjpeg ${LIBS_PREBUILT_DIR}/include/openjpeg-2.5 ) - endif (EXISTS ${LIBS_PREBUILT_DIR}/include/openjpeg) + endif (NOT EXISTS ${LIBS_PREBUILT_DIR}/include/openjpeg-2.5) target_link_libraries(ll::openjpeg INTERFACE openjp2 ) endif (USESYSTEMLIBS AND (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)) |