diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-03-02 15:58:55 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-03-02 15:58:55 +0100 |
| commit | 24c7a8d1e62dc52298ea1abdc8b44d70fff94b54 (patch) | |
| tree | c82a161ce02e177b6be5e63a65c5a2f42eecf2e6 /CMakeLists.txt | |
| parent | 4b5f37d07e4e691848b243ae795bb59893a6379c (diff) | |
| parent | 5b81f755a5303c3eab05c605711ecca32c071b6d (diff) | |
Merge branch 'astoecke_tokens' of somweyr.de:ousia into astoecke_tokens
Conflicts:
application/src/core/parser/stack/Callbacks.hpp
application/src/core/parser/stack/Handler.hpp
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 13de9ac..152dbfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,16 +182,16 @@ ADD_LIBRARY(ousia_core src/core/parser/ParserContext src/core/parser/ParserScope src/core/parser/stack/Callbacks -# src/core/parser/stack/DocumentHandler -# src/core/parser/stack/DomainHandler -# src/core/parser/stack/GenericParserStates + src/core/parser/stack/DocumentHandler + src/core/parser/stack/DomainHandler + src/core/parser/stack/GenericParserStates src/core/parser/stack/Handler -# src/core/parser/stack/ImportIncludeHandler + src/core/parser/stack/ImportIncludeHandler src/core/parser/stack/State # src/core/parser/stack/Stack src/core/parser/stack/TokenRegistry src/core/parser/stack/TokenStack -# src/core/parser/stack/TypesystemHandler + src/core/parser/stack/TypesystemHandler src/core/parser/utils/SourceOffsetVector src/core/parser/utils/TokenizedData src/core/parser/utils/Tokenizer @@ -216,8 +216,8 @@ ADD_LIBRARY(ousia_core #) ADD_LIBRARY(ousia_osml - src/formats/osml/OsmlParser src/formats/osml/OsmlStreamParser + src/formats/osml/OsmlParser ) TARGET_LINK_LIBRARIES(ousia_osml |