diff options
| author | davep <none@none> | 2014-08-27 13:04:32 -0500 |
|---|---|---|
| committer | davep <none@none> | 2014-08-27 13:04:32 -0500 |
| commit | 749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch) | |
| tree | eea7beb291f9fbffd5284da4f55701dcf5286720 /indra/cmake/Audio.cmake | |
| parent | d0428575fb9c3d285dc32e61808a877cb24efa89 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
Automated merge with https://bitbucket.org/davep/viewer-release
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} |