Skip to content
Snippets Groups Projects
Commit 9b64464d authored by Oz Linden's avatar Oz Linden
Browse files

more attempts to fix the hunspell lib for Mac

parent 7bcfd3a4
No related branches found
No related tags found
No related merge requests found
...@@ -214,12 +214,12 @@ elseif(DARWIN) ...@@ -214,12 +214,12 @@ elseif(DARWIN)
libexpat.1.5.2.dylib libexpat.1.5.2.dylib
libexpat.dylib libexpat.dylib
libGLOD.dylib libGLOD.dylib
libllqtwebkit.dylib libllqtwebkit.dylib
libminizip.a libminizip.a
libndofdev.dylib libndofdev.dylib
libhunspell-1.3.0.dylib libhunspell-1.3.0.dylib
libexception_handler.dylib libexception_handler.dylib
libcollada14dom.dylib libcollada14dom.dylib
) )
# fmod is statically linked on darwin # fmod is statically linked on darwin
...@@ -260,14 +260,15 @@ elseif(LINUX) ...@@ -260,14 +260,15 @@ elseif(LINUX)
libdb-5.1.so libdb-5.1.so
libexpat.so libexpat.so
libexpat.so.1 libexpat.so.1
libglod.so libglod.so
libgmock_main.so libgmock_main.so
libgmock.so.0 libgmock.so.0
libgmodule-2.0.so libgmodule-2.0.so
libgobject-2.0.so libgobject-2.0.so
libgtest_main.so libgtest_main.so
libgtest.so.0 libgtest.so.0
libminizip.so libhunspell-1.3.so.0.0.0
libminizip.so
libopenal.so libopenal.so
libopenjpeg.so libopenjpeg.so
libssl.so libssl.so
......
...@@ -10,7 +10,7 @@ find_path(HUNSPELL_INCLUDE_DIR hunspell.h ...@@ -10,7 +10,7 @@ find_path(HUNSPELL_INCLUDE_DIR hunspell.h
PATH_SUFFIXES hunspell 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 find_library(HUNSPELL_LIBRARY
NAMES ${HUNSPELL_NAMES} NAMES ${HUNSPELL_NAMES}
) )
......
...@@ -8,15 +8,15 @@ if (STANDALONE) ...@@ -8,15 +8,15 @@ if (STANDALONE)
include(FindHUNSPELL) include(FindHUNSPELL)
else (STANDALONE) else (STANDALONE)
use_prebuilt_binary(libhunspell) use_prebuilt_binary(libhunspell)
use_prebuilt_binary(dictionaries)
if (WINDOWS) if (WINDOWS)
set(HUNSPELL_LIBRARY libhunspell) set(HUNSPELL_LIBRARY libhunspell)
set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
elseif(DARWIN) elseif(DARWIN)
set(HUNSPELL_LIBRARY hunspell-1.3.0)
elseif(LINUX)
set(HUNSPELL_LIBRARY hunspell-1.3) set(HUNSPELL_LIBRARY hunspell-1.3)
set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
else() else()
set(HUNSPELL_LIBRARY hunspell-1.3) message(FATAL_ERROR "Invalid platform")
set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
endif() endif()
set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
use_prebuilt_binary(dictionaries)
endif (STANDALONE) endif (STANDALONE)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment