summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-10-08 11:02:15 +0800
committerErik Kundiman <erik@megapahit.org>2024-10-08 11:02:15 +0800
commit0efe72e7993a9a23a6f8952368548775cb0ea3ef (patch)
tree6c4d0c13ea8a8734d92c013c9ddb17d58f67d3fa
parent3fa052f6a2e642a6f1c450ec77f7b47a49016558 (diff)
Explicit on OpenJPEG library being static
It wasn't inheriting the viewer's BUILD_SHARED_LIBS setting.
-rw-r--r--indra/cmake/OpenJPEG.cmake4
1 files changed, 3 insertions, 1 deletions
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})