diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
| commit | 77afc073c54d6d03b7a24276a08d1924372058d0 (patch) | |
| tree | 95f472eabe4407cca653af3a867808f32402551c /indra/cmake/OpenJPEG.cmake | |
| parent | 5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (diff) | |
| parent | 4df2c0b8d67af267d3c9c6d58d63df3ed063a89e (diff) | |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/cmake/OpenJPEG.cmake')
| -rw-r--r-- | indra/cmake/OpenJPEG.cmake | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index bf0bde2ba7..a078c97cb8 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -8,15 +8,7 @@ if (USESYSTEMLIBS) include(FindOpenJPEG) else (USESYSTEMLIBS) use_prebuilt_binary(openjpeg) - - if(WINDOWS) - # Windows has differently named release and debug openjpeg(d) libs. - set(OPENJPEG_LIBRARIES - debug openjpegd - optimized openjpeg) - else(WINDOWS) - set(OPENJPEG_LIBRARIES openjpeg) - endif(WINDOWS) - - set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg) + + set(OPENJPEG_LIBRARIES openjp2) + set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg) endif (USESYSTEMLIBS) |