diff options
author | Patrick Sapinski | 2010-08-24 03:04:20 -0400 |
---|---|---|
committer | McCabe Maxsted | 2010-08-30 17:04:59 -0700 |
commit | ded1245db74ae4c97d174c5779f8572ee2f032fa (patch) | |
tree | f42c33f233ed68e715a0ac4c74ddc043f43a68da /linden/indra/cmake | |
parent | Added debug setting UseLegacyChatLogsFolder for saving chat.txt and IM logs i... (diff) | |
download | meta-impy-ded1245db74ae4c97d174c5779f8572ee2f032fa.zip meta-impy-ded1245db74ae4c97d174c5779f8572ee2f032fa.tar.gz meta-impy-ded1245db74ae4c97d174c5779f8572ee2f032fa.tar.bz2 meta-impy-ded1245db74ae4c97d174c5779f8572ee2f032fa.tar.xz |
added spellcheck + translation from Emerald Viewer. references to modularsystems.sl should be changed!
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 2 | ||||
-rw-r--r-- | linden/indra/cmake/FindHunSpell.cmake | 34 | ||||
-rw-r--r-- | linden/indra/cmake/FindJsonCpp.cmake | 60 | ||||
-rw-r--r-- | linden/indra/cmake/HUNSPELL.cmake | 16 | ||||
-rw-r--r-- | linden/indra/cmake/JsonCpp.cmake | 28 |
5 files changed, 140 insertions, 0 deletions
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 13530d8..b544c15 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
@@ -25,6 +25,7 @@ set(debug_files | |||
25 | nssckbi.dll | 25 | nssckbi.dll |
26 | openal32.dll | 26 | openal32.dll |
27 | openjpegd.dll | 27 | openjpegd.dll |
28 | libhunspell.dll | ||
28 | plc4.dll | 29 | plc4.dll |
29 | plds4.dll | 30 | plds4.dll |
30 | smime3.dll | 31 | smime3.dll |
@@ -111,6 +112,7 @@ set(release_files | |||
111 | nssckbi.dll | 112 | nssckbi.dll |
112 | openal32.dll | 113 | openal32.dll |
113 | openjpeg.dll | 114 | openjpeg.dll |
115 | libhunspell.dll | ||
114 | plc4.dll | 116 | plc4.dll |
115 | plds4.dll | 117 | plds4.dll |
116 | smime3.dll | 118 | smime3.dll |
diff --git a/linden/indra/cmake/FindHunSpell.cmake b/linden/indra/cmake/FindHunSpell.cmake new file mode 100644 index 0000000..d41f9cf --- /dev/null +++ b/linden/indra/cmake/FindHunSpell.cmake | |||
@@ -0,0 +1,34 @@ | |||
1 | FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell.hxx | ||
2 | /usr/local/include/hunspell | ||
3 | /usr/local/include | ||
4 | /usr/include/hunspell | ||
5 | /usr/include | ||
6 | ) | ||
7 | |||
8 | SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2) | ||
9 | FIND_LIBRARY(HUNSPELL_LIBRARY | ||
10 | NAMES ${HUNSPELL_NAMES} | ||
11 | PATHS /usr/lib /usr/local/lib | ||
12 | ) | ||
13 | |||
14 | IF(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR) | ||
15 | SET(HUNSPELL_LIBRARIES ${HUNSPELL_LIBRARY}) | ||
16 | SET(HUNSPELL_FOUND "YES") | ||
17 | ELSE(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR) | ||
18 | SET(HUNSPELL_FOUND "NO") | ||
19 | ENDIF(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR) | ||
20 | |||
21 | IF(HUNSPELL_FOUND) | ||
22 | IF(NOT HUNSPELL_FIND_QUIETLY) | ||
23 | MESSAGE(STATUS "Found Hunspell: ${HUNSPELL_LIBRARIES}") | ||
24 | ENDIF(NOT HUNSPELL_FIND_QUIETLY) | ||
25 | ELSE(HUNSPELL_FOUND) | ||
26 | IF(HUNSPELL_FIND_REQUIRED) | ||
27 | MESSAGE(FATAL_ERROR "Could not find HunSpell library") | ||
28 | ENDIF(HUNSPELL_FIND_REQUIRED) | ||
29 | ENDIF(HUNSPELL_FOUND) | ||
30 | |||
31 | MARK_AS_ADVANCED( | ||
32 | HUNSPELL_LIBRARY | ||
33 | HUNSPELL_INCLUDE_DIR | ||
34 | ) | ||
diff --git a/linden/indra/cmake/FindJsonCpp.cmake b/linden/indra/cmake/FindJsonCpp.cmake new file mode 100644 index 0000000..cf84b30 --- /dev/null +++ b/linden/indra/cmake/FindJsonCpp.cmake | |||
@@ -0,0 +1,60 @@ | |||
1 | # -*- cmake -*- | ||
2 | |||
3 | # - Find JSONCpp | ||
4 | # Find the JSONCpp includes and library | ||
5 | # This module defines | ||
6 | # JSONCPP_INCLUDE_DIR, where to find json.h, etc. | ||
7 | # JSONCPP_LIBRARIES, the libraries needed to use jsoncpp. | ||
8 | # JSONCPP_FOUND, If false, do not try to use jsoncpp. | ||
9 | # also defined, but not for general use are | ||
10 | # JSONCPP_LIBRARY, where to find the jsoncpp library. | ||
11 | |||
12 | FIND_PATH(JSONCPP_INCLUDE_DIR jsoncpp/json.h | ||
13 | /usr/local/include | ||
14 | /usr/include | ||
15 | ) | ||
16 | |||
17 | # Get the GCC compiler version | ||
18 | EXEC_PROGRAM(${CMAKE_CXX_COMPILER} | ||
19 | ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion | ||
20 | OUTPUT_VARIABLE _gcc_COMPILER_VERSION | ||
21 | OUTPUT_STRIP_TRAILING_WHITESPACE | ||
22 | ) | ||
23 | |||
24 | # Try to find a library that was compiled with the same compiler version as we currently use. | ||
25 | SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so) | ||
26 | IF (STANDALONE) | ||
27 | # On standalone, assume that the system installed library was compiled with the used compiler. | ||
28 | SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) | ||
29 | ENDIF (STANDALONE) | ||
30 | FIND_LIBRARY(JSONCPP_LIBRARY | ||
31 | NAMES ${JSONCPP_NAMES} | ||
32 | PATHS /usr/lib /usr/local/lib | ||
33 | ) | ||
34 | |||
35 | IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR) | ||
36 | SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY}) | ||
37 | SET(JSONCPP_FOUND "YES") | ||
38 | ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR) | ||
39 | SET(JSONCPP_FOUND "NO") | ||
40 | ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR) | ||
41 | |||
42 | |||
43 | IF (JSONCPP_FOUND) | ||
44 | IF (NOT JSONCPP_FIND_QUIETLY) | ||
45 | MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}") | ||
46 | ENDIF (NOT JSONCPP_FIND_QUIETLY) | ||
47 | ELSE (JSONCPP_FOUND) | ||
48 | IF (JSONCPP_FIND_REQUIRED) | ||
49 | MESSAGE(FATAL_ERROR "Could not find JSONCpp library") | ||
50 | ENDIF (JSONCPP_FIND_REQUIRED) | ||
51 | ENDIF (JSONCPP_FOUND) | ||
52 | |||
53 | # Deprecated declarations. | ||
54 | SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} ) | ||
55 | GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH) | ||
56 | |||
57 | MARK_AS_ADVANCED( | ||
58 | JSONCPP_LIBRARY | ||
59 | JSONCPP_INCLUDE_DIR | ||
60 | ) | ||
diff --git a/linden/indra/cmake/HUNSPELL.cmake b/linden/indra/cmake/HUNSPELL.cmake new file mode 100644 index 0000000..cd5d7e0 --- /dev/null +++ b/linden/indra/cmake/HUNSPELL.cmake | |||
@@ -0,0 +1,16 @@ | |||
1 | # -*- cmake -*- | ||
2 | include(Prebuilt) | ||
3 | |||
4 | if (STANDALONE) | ||
5 | include(FindHunSpell) | ||
6 | else (STANDALONE) | ||
7 | use_prebuilt_binary(hunspell) | ||
8 | |||
9 | set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell) | ||
10 | |||
11 | if (LINUX OR DARWIN) | ||
12 | set(HUNSPELL_LIBRARY hunspell-1.2) | ||
13 | else (LINUX OR DARWIN) | ||
14 | set(HUNSPELL_LIBRARY libhunspell) | ||
15 | endif (LINUX OR DARWIN) | ||
16 | endif (STANDALONE) | ||
diff --git a/linden/indra/cmake/JsonCpp.cmake b/linden/indra/cmake/JsonCpp.cmake new file mode 100644 index 0000000..fe6369d --- /dev/null +++ b/linden/indra/cmake/JsonCpp.cmake | |||
@@ -0,0 +1,28 @@ | |||
1 | # -*- cmake -*- | ||
2 | |||
3 | include(Prebuilt) | ||
4 | |||
5 | set(JSONCPP_FIND_QUIETLY ON) | ||
6 | set(JSONCPP_FIND_REQUIRED ON) | ||
7 | |||
8 | if (STANDALONE) | ||
9 | include(FindJsonCpp) | ||
10 | else (STANDALONE) | ||
11 | use_prebuilt_binary(jsoncpp) | ||
12 | if (WINDOWS) | ||
13 | if (MSVC80) | ||
14 | set(JSONCPP_LIBRARIES | ||
15 | debug json_vc80d | ||
16 | optimized json_vc80) | ||
17 | elseif (MSVC90) | ||
18 | set(JSONCPP_LIBRARIES | ||
19 | debug json_vc90d | ||
20 | optimized json_vc90) | ||
21 | endif(MSVC80) | ||
22 | elseif (DARWIN) | ||
23 | set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) | ||
24 | elseif (LINUX) | ||
25 | set(JSONCPP_LIBRARIES jsoncpp) | ||
26 | endif (WINDOWS) | ||
27 | set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) | ||
28 | endif (STANDALONE) | ||