Commit 376c587a15b7550882a84f8c8a104906a1e235af
1 parent
e1abfca0
- EMBEDDED_DEFAULT_DICT jednak ustawiane implicite, ale nie uniemożliwia stworzenia słownika w pliku
git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@266 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Showing
2 changed files
with
9 additions
and
1 deletions
CMakeLists.txt
| ... | ... | @@ -24,6 +24,11 @@ message ("Version=${Morfeusz_VERSION}") |
| 24 | 24 | # message (WARNING "Implicitly setting EMBEDDED_DEFAULT_DICT variable to TRUE") |
| 25 | 25 | #endif () |
| 26 | 26 | |
| 27 | +if ( (NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux") OR ((NOT INPUT_DICTIONARIES) AND NOT (SKIP_DICTIONARY_BUILDING))) | |
| 28 | + set (EMBEDDED_DEFAULT_DICT 1) | |
| 29 | + message (WARNING "Implicitly setting EMBEDDED_DEFAULT_DICT variable to TRUE") | |
| 30 | +endif () | |
| 31 | + | |
| 27 | 32 | # INPUT_DICTIONARY_CPP |
| 28 | 33 | if (EMBEDDED_DEFAULT_DICT) |
| 29 | 34 | if (NOT ANALYZER_DICTIONARY_CPP) |
| ... | ... |
morfeusz/CMakeLists.txt
| ... | ... | @@ -11,9 +11,12 @@ if (SKIP_DICTIONARY_BUILDING) |
| 11 | 11 | message ("SKIPPING dictionary building") |
| 12 | 12 | else () |
| 13 | 13 | if (EMBEDDED_DEFAULT_DICT) |
| 14 | + if (DEFAULT_DICT_DIR) | |
| 15 | + set (ADDITIONAL_CMD --dict-dir="${DEFAULT_DICT_DIR}" --dict="${DEFAULT_DICT_NAME}") | |
| 16 | + endif () | |
| 14 | 17 | add_custom_command ( |
| 15 | 18 | OUTPUT "${ANALYZER_DICTIONARY_CPP}" "${GENERATOR_DICTIONARY_CPP}" |
| 16 | - COMMAND python ${PROJECT_SOURCE_DIR}/fsabuilder/morfeusz_builder --input-files="${INPUT_DICTIONARIES}" --analyzer-cpp="${ANALYZER_DICTIONARY_CPP}" --generator-cpp="${GENERATOR_DICTIONARY_CPP}" --tagset-file="${INPUT_TAGSET}" --segments-file="${SEGMENT_RULES_FILE}" | |
| 19 | + COMMAND python ${PROJECT_SOURCE_DIR}/fsabuilder/morfeusz_builder --input-files="${INPUT_DICTIONARIES}" --dict="${DEFAULT_DICT_NAME}" --analyzer-cpp="${ANALYZER_DICTIONARY_CPP}" --generator-cpp="${GENERATOR_DICTIONARY_CPP}" --tagset-file="${INPUT_TAGSET}" --segments-file="${SEGMENT_RULES_FILE}" ${ADDITIONAL_CMD} | |
| 17 | 20 | DEPENDS "${INPUT_DICTIONARY}" |
| 18 | 21 | COMMENT "Building default dictionary C++ files" |
| 19 | 22 | ) |
| ... | ... |