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/Audio.cmake | |
| parent | 770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge viewer-release and become version 3.7.12
Diffstat (limited to 'indra/cmake/Audio.cmake')
| -rwxr-xr-x | indra/cmake/Audio.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index d23bc2f9c6..876b7f82a8 100755 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake @@ -1,13 +1,13 @@ # -*- cmake -*- include(Prebuilt) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindPkgConfig) pkg_check_modules(OGG REQUIRED ogg) pkg_check_modules(VORBIS REQUIRED vorbis) pkg_check_modules(VORBISENC REQUIRED vorbisenc) pkg_check_modules(VORBISFILE REQUIRED vorbisfile) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(ogg-vorbis) set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) @@ -32,7 +32,7 @@ else (STANDALONE) set(VORBISENC_LIBRARIES vorbisenc) set(VORBISFILE_LIBRARIES vorbisfile) endif (WINDOWS) -endif (STANDALONE) +endif (USESYSTEMLIBS) link_directories( ${VORBIS_LIBRARY_DIRS} |