Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Analysers
maca
Commits
98ab1f66
Commit
98ab1f66
authored
Aug 07, 2018
by
Igor Danielewicz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed incompatibility with new version of corpus2
parent
57f9fa8d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
4 deletions
+14
-4
.gitignore
.gitignore
+1
-0
CMakeLists.txt
CMakeLists.txt
+3
-3
swig/CMakeLists.txt
swig/CMakeLists.txt
+7
-0
swig/maca.i
swig/maca.i
+3
-1
No files found.
.gitignore
View file @
98ab1f66
...
...
@@ -6,6 +6,7 @@ tests/tests
#*#
*~
/tmp/
/build
CMakeCache.txt
CMakeFiles
CMakeLists.txt.user*
...
...
CMakeLists.txt
View file @
98ab1f66
...
...
@@ -62,9 +62,9 @@ add_subdirectory(maca-analyse)
add_subdirectory
(
maca-reanalyse
)
add_subdirectory
(
maca-convert
)
if
(
UNIX
)
add_subdirectory
(
tests
)
endif
()
#
if(UNIX)
#
add_subdirectory(tests)
#
endif()
if
(
MACA_BUILD_SWIG
)
FIND_PACKAGE
(
SWIG
)
...
...
swig/CMakeLists.txt
View file @
98ab1f66
PROJECT
(
MacaSwigWrap
)
set
(
CMAKE_CXX_STANDARD 11
)
find_package
(
Toki REQUIRED
)
set
(
TOKI_LIBS
${
Toki_LIBRARY
}
)
find_package
(
LibXML++ REQUIRED QUIET
)
include_directories
(
${
LibXML++_INCLUDE_DIRS
}
)
link_directories
(
${
LibXML++_LIBRARY_DIRS
}
)
set
(
LIBS
${
LIBS
}
${
LibXML++_LIBRARIES
}
)
find_package
(
Corpus2 1.0.8 REQUIRED
)
set
(
CORPUS2_LIBS
${
Corpus2_LIBRARY
}
)
include_directories
(
${
Corpus2_INCLUDE_DIR
}
)
...
...
swig/maca.i
View file @
98ab1f66
...
...
@@ -3,10 +3,12 @@
%
module
maca
%
{
//
#
include
<
libxml
++/
libxml
++
.
h
>
%
}
%
include
<
libcorpus2
/
unicodestring
.
i
>
%
include
<
libcorpus2
/
unicodestring
.
i
>
//%include <libcorpus2/corpus2exception.i>
%
include
"plaintextreader.i"
%
include
"premorphtextreader.i"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment