From 6d050cad618493b7881ea6d0073e64ba732b6352 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 10 Feb 2012 16:25:55 +0100 Subject: - fixed : Hunspell linking issues --- indra/cmake/Hunspell.cmake | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 indra/cmake/Hunspell.cmake (limited to 'indra/cmake/Hunspell.cmake') 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.3 From e02bf8f90dba7cd7ac8874d7ee1baf782397784f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 14:00:25 -0400 Subject: add dictionaries to the Hunspell.cmake so that it gets installed --- build.sh | 27 +++++++++++++-------------- indra/cmake/Hunspell.cmake | 1 + 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/cmake/Hunspell.cmake') diff --git a/build.sh b/build.sh index 90818009c3..c14fdc006f 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,12 @@ # * The basic convention is that the build name can be mapped onto a mercurial URL, # which is also used as the "branch" name. +check_for() +{ + if [ -e "$2" ]; then found_dict='FOUND'; else found_dict='MISSING'; fi + echo "$1 ${found_dict} '$2' " 1>&2 +} + build_dir_Darwin() { echo build-darwin-i386 @@ -59,8 +65,7 @@ pre_build() && [ -r "$master_message_template_checkout/message_template.msg" ] \ && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" - echo -n "Before 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "Before 'autobuild configure'" ${build_dir}/packages/dictionaries "$AUTOBUILD" configure -c $variant -- \ -DPACKAGE:BOOL=ON \ @@ -71,10 +76,9 @@ pre_build() -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url - echo -n "After 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries - end_section "Pre$variant" + end_section "Pre$variant" } build() @@ -84,8 +88,7 @@ build() then begin_section "Viewer$variant" - echo -n "Before 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries if "$AUTOBUILD" build --no-configure -c $variant then @@ -93,8 +96,7 @@ build() else echo false >"$build_dir"/build_ok fi - echo -n "After 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries end_section "Viewer$variant" fi @@ -190,15 +192,12 @@ eval "$("$AUTOBUILD" source_environment)" # dump environment variables for debugging env|sort - -echo -n "Before 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2 -(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 +check_for "Before 'autobuild install'" ${build_dir}/packages/dictionaries # Install packages. "$AUTOBUILD" install --skip-license-check -echo -n "After 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2 -(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 +check_for "After 'autobuild install'" ${build_dir}/packages/dictionaries # Now run the build succeeded=true 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.3 From 9b64464d02918307048be6fe5f0b784010d38bf8 Mon Sep 17 00:00:00 2001 From: Oz Linden 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/Hunspell.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.3