SGJP / Morfeusz

Commit 78acb9af2be975813d403b03fc986132945e4489

Authored by Michał Lenart
1 parent 1bceb6a1
master ... ubu18

- różne małe poprawki w budowaniu źródeł 

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@80 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Inline Side-by-side
Showing 5 changed files with 13 additions and 12 deletions
CMakeLists.txt
  View file @78acb9a
... ... @@ -5,7 +5,9 @@ project (Morfeusz)
5 5 set (Morfeusz_VERSION_MAJOR 2)
6 6 set (Morfeusz_VERSION_MINOR 0)
7 7 set (Morfeusz_VERSION_PATCH 0)
8   -set (CMAKE_BUILD_TYPE "Release")
  8 +set (CMAKE_BUILD_TYPE "Debug")
  9 +
  10 +enable_testing()
9 11  
10 12 ##### initialize some vars #####
11 13  
... ... @@ -48,10 +50,6 @@ if ("${TARGET_DIR}" STREQUAL "")
48 50 endif ()
49 51  
50 52 ### Compilation and linking flags
51   -if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
52   - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -pedantic -Wcast-align -Wextra -Wmissing-noreturn -Wconversion -Wcast-qual -Wcast-align")
53   -endif ()
54   -# set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
55 53  
56 54 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
57 55 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -pedantic -Wcast-align -Wextra -Wmissing-noreturn -Wconversion -Wcast-qual -Wcast-align -O2")
... ... @@ -109,7 +107,7 @@ add_subdirectory (fsabuilder)
109 107 ########## add tests ##########
110 108  
111 109 macro (test_build_and_recognize fname method)
112   - add_test (TestBuild-${method}-${fname} python fsabuilder/fsa/buildfsa.py -i testfiles/${fname} -o /tmp/test-${method}-${fname}.fsa --tagset-file=testfiles/polimorf.tagset --output-format=BINARY --serialization-method=${method})
  110 + add_test (TestBuild-${method}-${fname} python fsabuilder/buildfsa.py -i testfiles/${fname} -o /tmp/test-${method}-${fname}.fsa --tagset-file=testfiles/polimorf.tagset --output-format=BINARY --serialization-method=${method})
113 111 add_test (TestRecognize-${method}-${fname} morfeusz/test_recognize_dict /tmp/test-${method}-${fname}.fsa testfiles/${fname})
114 112 # add_test (TestNOTRecognize-${method}-${fname} fsa/test_not_recognize /tmp/test-${method}-${fname}.fsa testfiles/out_of_dict)
115 113 # add_test (TestSpeed-${method}-${fname} fsa/test_speed /tmp/test-${method}-${fname}.fsa testfiles/speed_test_data)
... ...
build-darwin.tar.gz deleted
View file @1bceb6a
No preview for this file type
buildAll.sh
  View file @78acb9a
... ... @@ -33,8 +33,8 @@ function build {
33 33 cd "$srcDir"
34 34 }
35 35  
36   -build Linux amd64 package package-java package-python
37   -build Linux i386 package package-java
  36 +build Linux amd64 package package-java package-python package-builder
  37 +build Linux i386 package package-java package-builder
38 38 build Windows amd64 package package-java
39 39 build Windows i386 package package-java
40   -build Darwin amd64 package package-java
  40 +build Darwin amd64 package package-java package-builder
... ...
morfeusz/CMakeLists.txt
  View file @78acb9a
... ... @@ -55,12 +55,15 @@ target_link_libraries (test_result_equals libmorfeusz)
55 55 target_link_libraries (test_recognize_dict libmorfeusz)
56 56  
57 57 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
58   - target_link_libraries (libmorfeusz ws2_32)
  58 + target_link_libraries (libmorfeusz ws2_32)
  59 + set (TARGET_LIB_DIR bin)
  60 +else ()
  61 + set (TARGET_LIB_DIR lib)
59 62 endif ()
60 63  
61 64 add_subdirectory (java)
62 65 add_subdirectory (python)
63 66  
64 67 install (FILES ${INCLUDE_FILES} DESTINATION include/morfeusz)
65   -install (TARGETS libmorfeusz DESTINATION lib)
  68 +install (TARGETS libmorfeusz DESTINATION ${TARGET_LIB_DIR})
66 69 install (TARGETS morfeusz DESTINATION bin)
... ...
morfeusz/java/CMakeLists.txt
  View file @78acb9a
... ... @@ -44,5 +44,5 @@ add_custom_target(jmorfeusz-copy-readme
44 44 COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/README" "${CMAKE_CURRENT_BINARY_DIR}/README")
45 45  
46 46 add_custom_target(package-java
47   - COMMAND mkdir -p "${TARGET_DIR}/java" && ${CMAKE_COMMAND} -E tar "cfvz" "${TARGET_DIR}/jmorfeusz-${JMORFEUSZ_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCHITECTURE}.tar.gz" "${CMAKE_CURRENT_BINARY_DIR}/*.jar" "${CMAKE_CURRENT_BINARY_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CMAKE_CURRENT_BINARY_DIR}/README"
  47 + COMMAND mkdir -p "${TARGET_DIR}" && ${CMAKE_COMMAND} -E tar "cfvz" "${TARGET_DIR}/jmorfeusz-${JMORFEUSZ_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCHITECTURE}.tar.gz" "${CMAKE_CURRENT_BINARY_DIR}/*.jar" "${CMAKE_CURRENT_BINARY_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CMAKE_CURRENT_BINARY_DIR}/README"
48 48 DEPENDS jmorfeusz-jar jmorfeusz-copy-readme jmorfeusz)
... ...