summaryrefslogtreecommitdiffstats
path: root/src/uscxml/Factory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/uscxml/Factory.cpp')
-rw-r--r--src/uscxml/Factory.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp
index 84d7632..3032c09 100644
--- a/src/uscxml/Factory.cpp
+++ b/src/uscxml/Factory.cpp
@@ -148,27 +148,34 @@ Factory::Factory() {
}
#endif
-#ifdef V8_FOUND
+#if defined V8_FOUND and defined BUILD_DM_ECMA
{
V8DataModel* dataModel = new V8DataModel();
registerDataModel(dataModel);
}
#endif
-#ifdef JSC_FOUND
+#if defined JSC_FOUND and defined BUILD_DM_ECMA
{
JSCDataModel* dataModel = new JSCDataModel();
registerDataModel(dataModel);
}
#endif
-#ifdef SWI_FOUND
+#if defined SWI_FOUND and defined BUILD_DM_PROLOG
{
SWIDataModel* dataModel = new SWIDataModel();
registerDataModel(dataModel);
}
#endif
+#ifdef BUILD_DM_PROLOG
+ {
+ XPathDataModel* dataModel = new XPathDataModel();
+ registerDataModel(dataModel);
+ }
+#endif
+
#ifdef PROTOBUF_FOUND
{
MMIHTTPIOProcessor* ioProcessor = new MMIHTTPIOProcessor();
@@ -182,10 +189,6 @@ Factory::Factory() {
registerDataModel(dataModel);
}
{
- XPathDataModel* dataModel = new XPathDataModel();
- registerDataModel(dataModel);
- }
- {
USCXMLInvoker* invoker = new USCXMLInvoker();
registerInvoker(invoker);
}