diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-25 12:27:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-25 12:27:34 -0400 |
| commit | 9b64464d02918307048be6fe5f0b784010d38bf8 (patch) | |
| tree | aa4ffc42c44af85e54bc4f8fed0370c31ff80dae /indra/cmake | |
| parent | 7bcfd3a4ae824d973802b1431a13e91eee18c89a (diff) | |
more attempts to fix the hunspell lib for Mac
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 11 | ||||
| -rw-r--r-- | indra/cmake/FindHUNSPELL.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/Hunspell.cmake | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 6765d36ba3..224e0a8b51 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -214,12 +214,12 @@ elseif(DARWIN) libexpat.1.5.2.dylib libexpat.dylib libGLOD.dylib - libllqtwebkit.dylib - libminizip.a + libllqtwebkit.dylib + libminizip.a libndofdev.dylib libhunspell-1.3.0.dylib libexception_handler.dylib - libcollada14dom.dylib + libcollada14dom.dylib ) # fmod is statically linked on darwin @@ -260,14 +260,15 @@ elseif(LINUX) libdb-5.1.so libexpat.so libexpat.so.1 - libglod.so + libglod.so libgmock_main.so libgmock.so.0 libgmodule-2.0.so libgobject-2.0.so libgtest_main.so libgtest.so.0 - libminizip.so + libhunspell-1.3.so.0.0.0 + libminizip.so libopenal.so libopenjpeg.so libssl.so diff --git a/indra/cmake/FindHUNSPELL.cmake b/indra/cmake/FindHUNSPELL.cmake index d411bdb9e5..6faf22959c 100644 --- a/indra/cmake/FindHUNSPELL.cmake +++ b/indra/cmake/FindHUNSPELL.cmake @@ -10,7 +10,7 @@ find_path(HUNSPELL_INCLUDE_DIR hunspell.h PATH_SUFFIXES hunspell ) -set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3 libhunspell) +set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3.0 libhunspell) find_library(HUNSPELL_LIBRARY NAMES ${HUNSPELL_NAMES} ) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index 24cf41f4e4..0c9cf93316 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -8,15 +8,15 @@ if (STANDALONE) include(FindHUNSPELL) else (STANDALONE) use_prebuilt_binary(libhunspell) - use_prebuilt_binary(dictionaries) if (WINDOWS) set(HUNSPELL_LIBRARY libhunspell) - set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) elseif(DARWIN) + set(HUNSPELL_LIBRARY hunspell-1.3.0) + elseif(LINUX) set(HUNSPELL_LIBRARY hunspell-1.3) - set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) else() - set(HUNSPELL_LIBRARY hunspell-1.3) - set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) + message(FATAL_ERROR "Invalid platform") endif() + set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) + use_prebuilt_binary(dictionaries) endif (STANDALONE) |