diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-04 22:56:15 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-04 22:56:15 -0800 |
| commit | 4745d124c8d8b4725d8313311d9e8e4b9bf172ee (patch) | |
| tree | 2b5f17c88063978043f43697612ca5e38d21eec0 /indra | |
| parent | f7842eab6199d6d7ff2130e9395ced3e8f33f94d (diff) | |
STORM-1023 : allow non standalone and non install prebuilt to use local fmod package path in autobuild.xml
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/FMOD.cmake | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index 6a4322df9b..cb5124812d 100644..100755 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -10,22 +10,30 @@ if (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY) if (FMOD) - if (NOT INSTALL_PROPRIETARY) - # This cover the STANDALONE case and the NOT STANDALONE but not using proprietary libraries - # This should then be invoke by all open source devs outside LL + if (STANDALONE) + # In that case, we use the version of the library installed on the system set(FMOD_FIND_REQUIRED ON) include(FindFMOD) - else (NOT INSTALL_PROPRIETARY) - include(Prebuilt) - use_prebuilt_binary(fmod) - if (WINDOWS) - set(FMOD_LIBRARY fmod) - elseif (DARWIN) - set(FMOD_LIBRARY fmod) - elseif (LINUX) - set(FMOD_LIBRARY fmod-3.75) - endif (WINDOWS) - SET(FMOD_LIBRARIES ${FMOD_LIBRARY}) - set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - endif (NOT INSTALL_PROPRIETARY) + else (STANDALONE) + if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + # 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}") + 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 (WINDOWS) + set(FMOD_LIBRARY fmod) + elseif (DARWIN) + set(FMOD_LIBRARY fmod) + elseif (LINUX) + set(FMOD_LIBRARY fmod-3.75) + endif (WINDOWS) + set(FMOD_LIBRARIES ${FMOD_LIBRARY}) + set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) + endif (STANDALONE) endif (FMOD) |