diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
| commit | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (patch) | |
| tree | ef36b7031df4c96eab6b5f3343325f662382932c /indra/cmake/FMODEX.cmake | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
| parent | 15d8f355072f2184f046a7aafb1b5c606fe97880 (diff) | |
Merge
Diffstat (limited to 'indra/cmake/FMODEX.cmake')
| -rw-r--r-- | indra/cmake/FMODEX.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake index 65bc1cabeb..720933d1b7 100644 --- a/indra/cmake/FMODEX.cmake +++ b/indra/cmake/FMODEX.cmake @@ -4,17 +4,17 @@ # When building using proprietary binaries though (i.e. having access to LL private servers), # we always build with FMODEX. # Open source devs should use the -DFMODEX:BOOL=ON then if they want to build with FMOD, whether -# they are using STANDALONE or not. +# they are using USESYSTEMLIBS or not. if (INSTALL_PROPRIETARY) set(FMODEX ON CACHE BOOL "Using FMOD Ex sound library.") endif (INSTALL_PROPRIETARY) if (FMODEX) - if (STANDALONE) + if (USESYSTEMLIBS) # In that case, we use the version of the library installed on the system set(FMODEX_FIND_REQUIRED ON) include(FindFMODEX) - else (STANDALONE) + else (USESYSTEMLIBS) if (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR) # If the path have been specified in the arguments, use that set(FMODEX_LIBRARIES ${FMODEX_LIBRARY}) @@ -41,6 +41,6 @@ if (FMODEX) set(FMODEX_LIBRARIES ${FMODEX_LIBRARY}) set(FMODEX_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodex) endif (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR) - endif (STANDALONE) + endif (USESYSTEMLIBS) endif (FMODEX) |