diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-05 13:52:40 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-05 13:52:40 +0100 |
| commit | ddbea4164e126739f39658627c04e7e23b71e090 (patch) | |
| tree | bdac63cf2a1c73fd3f67fa03fc821ef4eaf93b83 /CMakeLists.txt | |
| parent | 3d6058315f7f0da9994e35c144d0acb76a252472 (diff) | |
| parent | 9cb01624a4efe2063d5870f41e033476d9368b6d (diff) | |
fixed conflict
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 922acfc..e9cc0da 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 @@ -119,6 +118,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,8 +154,7 @@ IF(TEST) ADD_EXECUTABLE(ousia_test_core test/core/BufferedCharReaderTest test/core/CodeTokenizerTest -# test/core/CSSTest -# test/core/CSSParserTest + test/core/CSSTest test/core/LoggerTest test/core/ManagedTest test/core/ManagedContainersTest @@ -169,6 +175,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 ) |