diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2014-12-05 12:35:58 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2014-12-05 12:35:58 +0100 |
| commit | 0a4fbfe17951498f9a5f650f6da81d90f4a533b4 (patch) | |
| tree | 42382d93989a35294bf127814885d873a9bde29f | |
| parent | d98fc013878ab28cb062a4f25a45199b9ee9574a (diff) | |
refactored CSSParser into plugins.
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/plugins/css/CSSParser.cpp (renamed from src/core/CSSParser.cpp) | 0 | ||||
| -rw-r--r-- | src/plugins/css/CSSParser.hpp (renamed from src/core/CSSParser.hpp) | 8 | ||||
| -rw-r--r-- | test/plugins/css/CSSParserTest.cpp (renamed from test/core/CSSParserTest.cpp) | 2 |
4 files changed, 22 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ceae5d1..3e469a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,6 @@ ADD_LIBRARY(ousia_core src/core/BufferedCharReader src/core/CodeTokenizer src/core/CSS - src/core/CSSParser src/core/Exceptions src/core/Logger src/core/Managed @@ -118,6 +117,14 @@ ADD_LIBRARY(ousia_core src/core/variant/Variant ) +ADD_LIBRARY(ousia_css + src/plugins/css/CSSParser +) + +TARGET_LINK_LIBRARIES(ousia_css + ousia_core +) + ADD_LIBRARY(ousia_xml src/plugins/xml/XmlParser ) @@ -147,7 +154,6 @@ IF(TEST) test/core/BufferedCharReaderTest test/core/CodeTokenizerTest test/core/CSSTest - test/core/CSSParserTest test/core/LoggerTest test/core/ManagedTest test/core/ManagedContainersTest @@ -167,6 +173,16 @@ IF(TEST) ousia_core ) + ADD_EXECUTABLE(ousia_test_css + test/plugins/css/CSSParserTest + ) + + TARGET_LINK_LIBRARIES(ousia_test_css + ${GTEST_LIBRARIES} + ousia_core + ousia_css + ) + ADD_EXECUTABLE(ousia_test_xml test/plugins/xml/XmlParserTest ) diff --git a/src/core/CSSParser.cpp b/src/plugins/css/CSSParser.cpp index d239359..d239359 100644 --- a/src/core/CSSParser.cpp +++ b/src/plugins/css/CSSParser.cpp diff --git a/src/core/CSSParser.hpp b/src/plugins/css/CSSParser.hpp index 870ce37..eb51dfa 100644 --- a/src/core/CSSParser.hpp +++ b/src/plugins/css/CSSParser.hpp @@ -22,13 +22,11 @@ #include <vector> #include <tuple> +#include <core/BufferedCharReader.hpp> +#include <core/CodeTokenizer.hpp> +#include <core/CSS.hpp> #include <core/parser/Parser.hpp> -#include "BufferedCharReader.hpp" -#include "CodeTokenizer.hpp" -#include "CSS.hpp" -#include "Exceptions.hpp" - namespace ousia { namespace parser { namespace css { diff --git a/test/core/CSSParserTest.cpp b/test/plugins/css/CSSParserTest.cpp index c231092..84d4893 100644 --- a/test/core/CSSParserTest.cpp +++ b/test/plugins/css/CSSParserTest.cpp @@ -20,7 +20,7 @@ #include <sstream> -#include <core/CSSParser.hpp> +#include <plugins/css/CSSParser.hpp> namespace ousia { namespace parser { |