From 0efe72e7993a9a23a6f8952368548775cb0ea3ef Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 8 Oct 2024 11:02:15 +0800 Subject: Explicit on OpenJPEG library being static It wasn't inheriting the viewer's BUILD_SHARED_LIBS setting. --- indra/cmake/OpenJPEG.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 34028e0f76..463e4365ce 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -25,7 +25,9 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg BINARY_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg TARGET openjp2 - CMAKE_FLAGS -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON + CMAKE_FLAGS + -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} + -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON OUTPUT_VARIABLE openjpeg_installed ) if (${OPENJPEG_RESULT}) -- cgit v1.2.3