diff options
| author | Anchor <none@none> | 2019-04-18 13:24:14 -0700 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 18:39:20 -0400 |
| commit | fc09af763c96d0bf13d721e1f74b8535379df766 (patch) | |
| tree | 0f1fbae527319678d30091df196facef43dd182c /indra/cmake | |
| parent | 24408d2a82c752df4ed35121a9761acf37511529 (diff) | |
[DRTVWR-476] - update openjpeg
Diffstat (limited to 'indra/cmake')
| -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 e2647f6b98..e121328d64 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 - openjp2.dll + openjpeg.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 965384f5e0..bf0bde2ba7 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 openjp2d - optimized openjp2) + debug openjpegd + optimized openjpeg) else(WINDOWS) set(OPENJPEG_LIBRARIES openjpeg) endif(WINDOWS) |