From 65b268ff861e8decadaee9a70b2d5ce78e571cbc Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Thu, 18 Apr 2019 11:33:23 -0700
Subject: [PATCH] [DRTVWR-476] - fix openjpeg dll path
---
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
indra/cmake/OpenJPEG.cmake | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index e121328d644..e2647f6b987 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -37,7 +37,7 @@ if(WINDOWS)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(release_files
- openjpeg.dll
+ openjp2.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index bf0bde2ba7b..965384f5e0e 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -12,8 +12,8 @@ else (USESYSTEMLIBS)
if(WINDOWS)
# Windows has differently named release and debug openjpeg(d) libs.
set(OPENJPEG_LIBRARIES
- debug openjpegd
- optimized openjpeg)
+ debug openjp2d
+ optimized openjp2)
else(WINDOWS)
set(OPENJPEG_LIBRARIES openjpeg)
endif(WINDOWS)
--
GitLab