diff options
| author | Anchor <none@none> | 2019-04-18 11:33:23 -0700 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 18:39:20 -0400 |
| commit | 65b268ff861e8decadaee9a70b2d5ce78e571cbc (patch) | |
| tree | c9750f17d35aa50c05433d7ddc5da7abab49ff6b | |
| parent | 101ab28f0c317e8c8489f0189f81b7b4e2381e9a (diff) | |
[DRTVWR-476] - fix openjpeg dll path
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rw-r--r-- | 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 e121328d64..e2647f6b98 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 bf0bde2ba7..965384f5e0 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) |