diff options
| -rw-r--r-- | indra/cmake/APR.cmake | 8 | ||||
| -rw-r--r-- | indra/cmake/CARes.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/FMOD.cmake | 17 | ||||
| -rw-r--r-- | indra/cmake/JPEG.cmake | 5 | ||||
| -rw-r--r-- | indra/cmake/MySQL.cmake | 4 |
5 files changed, 24 insertions, 14 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index b1aec807ee..2a96d70173 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -35,12 +35,12 @@ else (STANDALONE) ) elseif (DARWIN) set(APR_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1 - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1 + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a ) set(APRUTIL_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1 - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1 + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a ) set(APRICONV_LIBRARIES apriconv-1) else (WINDOWS) diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake index 68fabc3493..8a2dc01561 100644 --- a/indra/cmake/CARes.cmake +++ b/indra/cmake/CARes.cmake @@ -13,8 +13,8 @@ else (STANDALONE) set(CARES_LIBRARIES areslib) elseif (DARWIN) set(CARES_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/cares - debug ${ARCH_PREBUILT_DIRS_DEBUG}/cares + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a ) else (WINDOWS) set(CARES_LIBRARIES cares) diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index fddf6447ea..f90dc52681 100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -5,16 +5,27 @@ if(INSTALL_PROPRIETARY) use_prebuilt_binary(fmod) endif(INSTALL_PROPRIETARY) -find_library(FMOD_LIBRARY +find_library(FMOD_LIBRARY_RELEASE NAMES fmod fmodvc fmod-3.75 PATHS - optimized ${ARCH_PREBUILT_DIRS_RELEASE} - debug ${ARCH_PREBUILT_DIRS_DEBUG} + ${ARCH_PREBUILT_DIRS_RELEASE} ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client ) +find_library(FMOD_LIBRARY_DEBUG + NAMES fmod fmodvc fmod-3.75 + PATHS + ${ARCH_PREBUILT_DIRS_DEBUG} + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_debug + ) + +if(FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG) + set(FMOD_LIBRARY debug ${FMOD_LIBRARY_DEBUG} optimized ${FMOD_LIBRARY_RELEASE}) +endif(FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG) + if (NOT FMOD_LIBRARY) set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.") if (FMOD_SDK_DIR) diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 8047718f39..5d0ee0d2fd 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -13,9 +13,8 @@ else (STANDALONE) set(JPEG_LIBRARIES jpeg) elseif (DARWIN) set(JPEG_LIBRARIES - lljpeg - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/lljpeg - debug ${ARCH_PREBUILT_DIRS_DEBUG}/lljpeg + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a + debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a ) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib_6b) diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake index e7400a3de4..97dd0912cb 100644 --- a/indra/cmake/MySQL.cmake +++ b/indra/cmake/MySQL.cmake @@ -14,8 +14,8 @@ if (WINDOWS) elseif (DARWIN) set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(MYSQL_LIBRARIES - optimized ${LIBS_PREBUILT_DIRS_RELEASE}/mysqlclient - debug ${LIBS_PREBUILT_DIRS_DEBUG}/mysqlclient + optimized ${LIBS_PREBUILT_DIRS_RELEASE}/libmysqlclient.a + debug ${LIBS_PREBUILT_DIRS_DEBUG}/libmysqlclient.a ) else (WINDOWS) set(MYSQL_FIND_REQUIRED) |