diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-20 01:24:17 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-20 01:24:17 +0100 |
| commit | 57a1ea659ae125934c541951113c0c3a38b10971 (patch) | |
| tree | 8bf6f93a1c4b56cd48777b2f2f80c77466ef61ee /CMakeLists.txt | |
| parent | 20d3e71f26ca884271ed5d372a8459394554c147 (diff) | |
| parent | 533e1a93c8f636b78f5687dd9c343a81563081a1 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f5f0b71..432dbcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,6 @@ ADD_LIBRARY(ousia_core src/core/CodeTokenizer src/core/CSS src/core/Registry - src/core/ResourceLocator src/core/Tokenizer src/core/XML src/core/common/Argument @@ -138,6 +137,8 @@ ADD_LIBRARY(ousia_core src/core/parser/Parser src/core/parser/ParserStack src/core/parser/Scope + src/core/resource/Resource + src/core/resource/ResourceLocator # src/core/script/ScriptEngine ) @@ -197,7 +198,6 @@ IF(TEST) test/core/CSSTest test/core/RangeSetTest test/core/RegistryTest - test/core/ResourceLocatorTest test/core/TokenizerTest test/core/XMLTest test/core/common/ArgumentTest @@ -220,6 +220,7 @@ IF(TEST) test/core/model/NodeTest test/core/model/TypesystemTest test/core/parser/ParserStackTest + test/core/resource/ResourceLocatorTest # test/core/script/FunctionTest # test/core/script/ObjectTest # test/core/script/VariantTest |