diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 22:21:50 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 22:21:50 +0100 |
| commit | 51922e07def0ffbfc9ef411ccdcf373f61bc51b3 (patch) | |
| tree | d4bc644d960bca5ee37feedb0677601793eb15ef | |
| parent | d2f99e4b43ed93ef0fa8e138e0c3afc79775b77c (diff) | |
Fixed compilation of main application
| -rw-r--r-- | CMakeLists.txt | 30 | ||||
| -rw-r--r-- | src/cli/Main.cpp | 6 |
2 files changed, 23 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ec1bb4d..eb4016f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,6 +233,14 @@ TARGET_LINK_LIBRARIES(ousia_html ousia_core ) +ADD_LIBRARY(ousia_xml + src/plugins/xml/XmlOutput +) + +TARGET_LINK_LIBRARIES(ousia_xml + ousia_core +) + #ADD_LIBRARY(ousia_mozjs # src/plugins/mozjs/MozJsScriptEngine #) @@ -244,17 +252,19 @@ TARGET_LINK_LIBRARIES(ousia_html # Command line interface -#ADD_EXECUTABLE(ousia -# src/cli/Main -#) +ADD_EXECUTABLE(ousia + src/cli/Main +) -#TARGET_LINK_LIBRARIES(ousia -# ousia_core -# ousia_filesystem -# ousia_html -# ousia_xml -# ${Boost_LIBRARIES} -#) +TARGET_LINK_LIBRARIES(ousia + ousia_core + ousia_filesystem + ousia_html + ousia_xml + ousia_osml + ousia_osxml + ${Boost_LIBRARIES} +) # If testing is enabled, build the unit tests IF(TEST) diff --git a/src/cli/Main.cpp b/src/cli/Main.cpp index 2786025..8d7893a 100644 --- a/src/cli/Main.cpp +++ b/src/cli/Main.cpp @@ -49,7 +49,7 @@ #include <core/resource/ResourceManager.hpp> #include <plugins/filesystem/FileLocator.hpp> #include <plugins/html/DemoOutput.hpp> -#include <plugins/xml/XmlParser.hpp> +#include <formats/osxml/OsxmlParser.hpp> #include <plugins/xml/XmlOutput.hpp> const size_t ERROR_IN_COMMAND_LINE = 1; @@ -209,7 +209,7 @@ int main(int argc, char **argv) // fill registry registry.registerDefaultExtensions(); - XmlParser xmlParser; + OsxmlParser xmlParser; registry.registerParser( {"text/vnd.ousia.oxm", "text/vnd.ousia.oxd"}, {&RttiTypes::Document, &RttiTypes::Domain, &RttiTypes::Typesystem}, @@ -246,4 +246,4 @@ int main(int argc, char **argv) } return SUCCESS; -}
\ No newline at end of file +} |