diff options
| -rwxr-xr-x | indra/cmake/FMOD.cmake | 51 | ||||
| -rwxr-xr-x | indra/cmake/FindFMOD.cmake | 37 |
2 files changed, 34 insertions, 54 deletions
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index 4582017bcb..96434e38fa 100755 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -1,37 +1,24 @@ # -*- cmake -*- -include(Prebuilt) -set(FMOD_FIND_QUIETLY OFF) -set(FMOD_FIND_REQUIRED OFF) - -if (STANDALONE) - include(FindFMOD) -else (STANDALONE) - 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 (STANDALONE) - -if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) - set(FMOD ON CACHE BOOL "Use FMOD sound library.") -else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) - set(FMOD_LIBRARY "") - set(FMOD_INCLUDE_DIR "") - if (FMOD) - message(STATUS "No support for FMOD audio found.") - endif (FMOD) - set(FMOD OFF CACHE BOOL "FMOD sound library not used.") -endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) +set(FMOD ON CACHE BOOL "Use FMOD sound library.") if (FMOD) - message(STATUS "Building with FMOD audio support") + if (STANDALONE) + set(FMOD_FIND_REQUIRED ON) + include(FindFMOD) + else (STANDALONE) + 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 (STANDALONE) endif (FMOD) diff --git a/indra/cmake/FindFMOD.cmake b/indra/cmake/FindFMOD.cmake index 3659e97e61..c49c7537d8 100755 --- a/indra/cmake/FindFMOD.cmake +++ b/indra/cmake/FindFMOD.cmake @@ -9,36 +9,29 @@ # also defined, but not for general use are # FMOD_LIBRARY, where to find the FMOD library. -FIND_PATH(FMOD_INCLUDE_DIR fmod.h -/usr/local/include/fmod -/usr/local/include -/usr/include/fmod -/usr/include -) +FIND_PATH(FMOD_INCLUDE_DIR fmod.h PATH_SUFFIXES fmod) -SET(FMOD_NAMES ${FMOD_NAMES} fmod fmodvc fmod-3.75) FIND_LIBRARY(FMOD_LIBRARY - NAMES ${FMOD_NAMES} - PATHS /usr/lib /usr/local/lib + NAMES fmod fmodvc fmod-3.75 + PATH_SUFFIXES fmod ) IF (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) - SET(FMOD_LIBRARIES ${FMOD_LIBRARY}) - SET(FMOD "YES") + SET(FMOD_LIBRARIES ${FMOD_LIBRARY}) + SET(FMOD_FOUND "YES") ELSE (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) - SET(FMOD "NO") + SET(FMOD_FOUND "NO") ENDIF (FMOD_LIBRARY AND FMOD_INCLUDE_DIR) - -IF (FMOD) - IF (NOT FMOD_FIND_QUIETLY) - MESSAGE(STATUS "Found FMOD: ${FMOD_LIBRARIES}") - ENDIF (NOT FMOD_FIND_QUIETLY) -ELSE (FMOD) - IF (FMOD_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find FMOD library") - ENDIF (FMOD_FIND_REQUIRED) -ENDIF (FMOD) +IF (FMOD_FOUND) + IF (NOT FMOD_FIND_QUIETLY) + MESSAGE(STATUS "Found FMOD: ${FMOD_LIBRARIES}") + ENDIF (NOT FMOD_FIND_QUIETLY) +ELSE (FMOD_FOUND) + IF (FMOD_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find FMOD library") + ENDIF (FMOD_FIND_REQUIRED) +ENDIF (FMOD_FOUND) # Deprecated declarations. SET (NATIVE_FMOD_INCLUDE_PATH ${FMOD_INCLUDE_DIR} ) |