From 99768240183b52f5e51e52ce17d9b41e35fac052 Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(win7-laptop)>
Date: Tue, 17 Jan 2012 17:45:47 +0100
Subject: [PATCH] Restate CORPUS2_BUILD_POLIQARP as flag governing poliqarp
build. In other words, cut out poliqarp from build if this flag is False. The
flag remains forced to be True by default, though. This is mostly to be able
to cut poliqarp out of pure WIN32 build until such time it actually builds
(it doesn't atm).
---
CMakeLists.txt | 3 +++
libcorpus2_whole/CMakeLists.txt | 9 +++++++--
libcorpus2_whole/io/corpusreader.cpp | 18 ++++++++++++------
swig/CMakeLists.txt | 6 +++++-
4 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 302b8f6..cac476d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,12 +72,15 @@ MARK_AS_ADVANCED(LIBCORPUS2_SRC_DATA_DIR)
add_subdirectory(libpwrutils)
add_subdirectory(libcorpus2)
add_subdirectory(libcorpus2_whole)
+
if(CORPUS2_BUILD_POLIQARP)
add_subdirectory(poliqarp-library)
add_subdirectory(poliqarp)
+ add_definitions( -DWITH_POLIQARP )
else()
message(STATUS "Not building Poliqarp library and wrapper")
endif(CORPUS2_BUILD_POLIQARP)
+
add_subdirectory(corpus2tools)
add_subdirectory(tests)
diff --git a/libcorpus2_whole/CMakeLists.txt b/libcorpus2_whole/CMakeLists.txt
index e4f6ca9..8312adf 100644
--- a/libcorpus2_whole/CMakeLists.txt
+++ b/libcorpus2_whole/CMakeLists.txt
@@ -13,11 +13,16 @@ SET(libcorpus2_whole_SRC
io/relreader.cpp
io/documentreader.cpp
io/documentcorpusreader.cpp
- io/poliqarpdocumentreader.cpp
- io/poliqarpcorpusreader.cpp
io/corpusreader.cpp
)
+if(CORPUS2_BUILD_POLIQARP)
+ SET(libcorpus2_whole_SRC ${libcorpus2_whole_SRC}
+ io/poliqarpdocumentreader.cpp
+ io/poliqarpcorpusreader.cpp
+ )
+endif(CORPUS2_BUILD_POLIQARP)
+
file(GLOB_RECURSE INCS "*.h")
if(WIN32)
diff --git a/libcorpus2_whole/io/corpusreader.cpp b/libcorpus2_whole/io/corpusreader.cpp
index 56538ad..bbe0154 100644
--- a/libcorpus2_whole/io/corpusreader.cpp
+++ b/libcorpus2_whole/io/corpusreader.cpp
@@ -1,7 +1,11 @@
#include <libcorpus2_whole/io/corpusreader.h>
-#include <libcorpus2_whole/io/poliqarpcorpusreader.h>
#include <libcorpus2_whole/io/documentcorpusreader.h>
+#ifdef WITH_POLIQARP
+#include <libcorpus2_whole/io/poliqarpcorpusreader.h>
+#endif
+
+
namespace Corpus2 {
namespace whole{
@@ -24,14 +28,16 @@ boost::shared_ptr<Corpus> CorpusReader::read(const std::string& corpus_file_path
//
boost::shared_ptr<CorpusReaderI> CorpusReader::get_corpus_reader_by_type()
{
- if (corpus_type_ == "poliqarp") {
- return boost::shared_ptr<PoliqarpCorpusReader>(
- new PoliqarpCorpusReader(tagset_));
- } else if (corpus_type_ == "document") {
+ if (corpus_type_ == "document") {
return boost::shared_ptr<DocumentCorpusReader>(
new DocumentCorpusReader(tagset_));
+#ifdef WITH_POLIQARP
+ } else if (corpus_type_ == "poliqarp") {
+ return boost::shared_ptr<PoliqarpCorpusReader>(
+ new PoliqarpCorpusReader(tagset_));
+#endif
}
- throw Corpus2Error(corpus_type_ + " is unknown reader type!");
+ throw Corpus2Error(corpus_type_ + " is an unknown reader type!");
}
} // whole ns
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index 5e257c1..dd7bb2c 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -2,7 +2,11 @@
PROJECT(corpus2SwigWrap)
-set(LIBS "corpus2" "corpus2_whole" "corpus2_poliqarpreader" "pwrutils")
+set(LIBS "corpus2" "corpus2_whole" "pwrutils")
+
+if(CORPUS2_BUILD_POLIQARP)
+ set(LIBS ${LIBS} "corpus2_poliqarpreader" )
+endif(CORPUS2_BUILD_POLIQARP)
include_directories (${corpus2_SOURCE_DIR})
include_directories (${pwrutils_SOURCE_DIR})
--
GitLab