diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-19 17:03:51 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-19 17:03:51 -0400 |
| commit | 9ed7cc297a7e5b0bb912fea26491b3dd6ee90814 (patch) | |
| tree | a7885484c66690879ae0b4ab1e37ba4965303bc4 /indra/cmake/FMOD.cmake | |
| parent | bc400605cab6f353ab4b952a1056c6c22784d4d9 (diff) | |
| parent | af8864c49c4f9ca9421e3b259e8f51f0469ab7ce (diff) | |
merging in latest mesh-development
Diffstat (limited to 'indra/cmake/FMOD.cmake')
| -rw-r--r-- | indra/cmake/FMOD.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index cb5124812d..3586c1160a 100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -16,15 +16,15 @@ if (FMOD) include(FindFMOD) else (STANDALONE) if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) - # If the path have been specified in the arguments, use that + # If the path have been specified in the arguments, use that set(FMOD_LIBRARIES ${FMOD_LIBRARY}) - MESSAGE(STATUS "Using FMOD path: ${FMOD_LIBRARIES}, ${FMOD_INCLUDE_DIR}") + MESSAGE(STATUS "Using FMOD path: ${FMOD_LIBRARIES}, ${FMOD_INCLUDE_DIR}") else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) - # If not, we're going to try to get the package listed in autobuild.xml - # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) - # as accessing the private LL location will fail if you don't have the credential - include(Prebuilt) - use_prebuilt_binary(fmod) + # If not, we're going to try to get the package listed in autobuild.xml + # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) + # as accessing the private LL location will fail if you don't have the credential + include(Prebuilt) + use_prebuilt_binary(fmod) if (WINDOWS) set(FMOD_LIBRARY fmod) elseif (DARWIN) |