diff options
author | simon <none@none> | 2014-07-07 14:49:45 -0700 |
---|---|---|
committer | simon <none@none> | 2014-07-07 14:49:45 -0700 |
commit | 3e6698073cedc8b24068147cf6b7091f081ea125 (patch) | |
tree | 59d8759c554af8a733668dae9668ca6fd92bf820 /indra/cmake/OpenJPEG.cmake | |
parent | 770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff) | |
parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) |
Merge viewer-release and become version 3.7.12
Diffstat (limited to 'indra/cmake/OpenJPEG.cmake')
-rwxr-xr-x | indra/cmake/OpenJPEG.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index fcc82c2f49..bf0bde2ba7 100755 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -4,9 +4,9 @@ include(Prebuilt) set(OPENJPEG_FIND_QUIETLY ON) set(OPENJPEG_FIND_REQUIRED ON) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindOpenJPEG) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(openjpeg) if(WINDOWS) @@ -19,4 +19,4 @@ else (STANDALONE) endif(WINDOWS) set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg) -endif (STANDALONE) +endif (USESYSTEMLIBS) |