From 9c66ac87fd46db3987e60ae50989b2497099480b Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Fri, 20 Jan 2012 18:06:32 +0100
Subject: STORM-276 Basic spellchecking framework
---
indra/cmake/Copy3rdPartyLibs.cmake | 3 +++
indra/cmake/ViewerMiscLibs.cmake | 1 +
2 files changed, 4 insertions(+)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 394db362b1..ebeae3e5be 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -41,6 +41,7 @@ if(WINDOWS)
libeay32.dll
libcollada14dom22-d.dll
glod.dll
+ libhunspell.dll
)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
@@ -53,6 +54,7 @@ if(WINDOWS)
libeay32.dll
libcollada14dom22.dll
glod.dll
+ libhunspell.dll
)
if(USE_GOOGLE_PERFTOOLS)
@@ -215,6 +217,7 @@ elseif(DARWIN)
libllqtwebkit.dylib
libminizip.a
libndofdev.dylib
+ libhunspell-1.3.dylib
libexception_handler.dylib
libcollada14dom.dylib
)
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index df013b1665..f907181929 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,6 +2,7 @@
include(Prebuilt)
if (NOT STANDALONE)
+ use_prebuilt_binary(libhunspell)
use_prebuilt_binary(libuuid)
use_prebuilt_binary(slvoice)
use_prebuilt_binary(fontconfig)
--
cgit v1.2.3
From 6d050cad618493b7881ea6d0073e64ba732b6352 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Fri, 10 Feb 2012 16:25:55 +0100
Subject: - fixed : Hunspell linking issues
---
indra/cmake/CMakeLists.txt | 1 +
indra/cmake/FindHUNSPELL.cmake | 38 ++++++++++++++++++++++++++++++++++++++
indra/cmake/Hunspell.cmake | 21 +++++++++++++++++++++
3 files changed, 60 insertions(+)
create mode 100644 indra/cmake/FindHUNSPELL.cmake
create mode 100644 indra/cmake/Hunspell.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 279d577a27..9b836aac5f 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -37,6 +37,7 @@ set(cmake_SOURCE_FILES
GLOD.cmake
GStreamer010Plugin.cmake
GooglePerfTools.cmake
+ Hunspell.cmake
JPEG.cmake
LLAddBuildTest.cmake
LLAudio.cmake
diff --git a/indra/cmake/FindHUNSPELL.cmake b/indra/cmake/FindHUNSPELL.cmake
new file mode 100644
index 0000000000..d411bdb9e5
--- /dev/null
+++ b/indra/cmake/FindHUNSPELL.cmake
@@ -0,0 +1,38 @@
+# -*- cmake -*-
+
+# - Find HUNSPELL
+# This module defines
+# HUNSPELL_INCLUDE_DIR, where to find libhunspell.h, etc.
+# HUNSPELL_LIBRARY, the library needed to use HUNSPELL.
+# HUNSPELL_FOUND, If false, do not try to use HUNSPELL.
+
+find_path(HUNSPELL_INCLUDE_DIR hunspell.h
+ PATH_SUFFIXES hunspell
+ )
+
+set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3 libhunspell)
+find_library(HUNSPELL_LIBRARY
+ NAMES ${HUNSPELL_NAMES}
+ )
+
+if (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+ set(HUNSPELL_FOUND "YES")
+else (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+ set(HUNSPELL_FOUND "NO")
+endif (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+
+
+if (HUNSPELL_FOUND)
+ if (NOT HUNSPELL_FIND_QUIETLY)
+ message(STATUS "Found Hunspell: Library in '${HUNSPELL_LIBRARY}' and header in '${HUNSPELL_INCLUDE_DIR}' ")
+ endif (NOT HUNSPELL_FIND_QUIETLY)
+else (HUNSPELL_FOUND)
+ if (HUNSPELL_FIND_REQUIRED)
+ message(FATAL_ERROR " * * *\nCould not find HUNSPELL library! * * *")
+ endif (HUNSPELL_FIND_REQUIRED)
+endif (HUNSPELL_FOUND)
+
+mark_as_advanced(
+ HUNSPELL_LIBRARY
+ HUNSPELL_INCLUDE_DIR
+ )
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
new file mode 100644
index 0000000000..def2198c93
--- /dev/null
+++ b/indra/cmake/Hunspell.cmake
@@ -0,0 +1,21 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(HUNSPELL_FIND_QUIETLY ON)
+set(HUNSPELL_FIND_REQUIRED ON)
+
+if (STANDALONE)
+ include(FindHUNSPELL)
+else (STANDALONE)
+ use_prebuilt_binary(libhunspell)
+ if (WINDOWS)
+ set(HUNSPELL_LIBRARY libhunspell)
+ set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
+ elseif(DARWIN)
+ 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)
+ endif()
+endif (STANDALONE)
--
cgit v1.2.3
From e02bf8f90dba7cd7ac8874d7ee1baf782397784f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 23 Apr 2012 14:00:25 -0400
Subject: add dictionaries to the Hunspell.cmake so that it gets installed
---
indra/cmake/Hunspell.cmake | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
index def2198c93..24cf41f4e4 100644
--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -8,6 +8,7 @@ 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)
--
cgit v1.2.3
From 7bcfd3a4ae824d973802b1431a13e91eee18c89a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 23 Apr 2012 17:27:54 -0400
Subject: fix version number of the libhunspell dylib in another place
---
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index ebeae3e5be..6765d36ba3 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -217,7 +217,7 @@ elseif(DARWIN)
libllqtwebkit.dylib
libminizip.a
libndofdev.dylib
- libhunspell-1.3.dylib
+ libhunspell-1.3.0.dylib
libexception_handler.dylib
libcollada14dom.dylib
)
--
cgit v1.2.3
From 9b64464d02918307048be6fe5f0b784010d38bf8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 25 Apr 2012 12:27:34 -0400
Subject: more attempts to fix the hunspell lib for Mac
---
indra/cmake/Copy3rdPartyLibs.cmake | 11 ++++++-----
indra/cmake/FindHUNSPELL.cmake | 2 +-
indra/cmake/Hunspell.cmake | 10 +++++-----
3 files changed, 12 insertions(+), 11 deletions(-)
(limited to 'indra/cmake')
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)
--
cgit v1.2.3