diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-12 23:33:52 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-12 23:33:52 (GMT) |
| commit | bbd892b435c12395a6cf53bc53ed5acf195e4cbd (patch) | |
| tree | 86ca106d7d347eb6361fca8c1dec4d7fc7cae965 /src/uscxml | |
| parent | 57510db0f3f10f85ecea53376ccf40688e2475bd (diff) | |
| download | uscxml-bbd892b435c12395a6cf53bc53ed5acf195e4cbd.zip uscxml-bbd892b435c12395a6cf53bc53ed5acf195e4cbd.tar.gz uscxml-bbd892b435c12395a6cf53bc53ed5acf195e4cbd.tar.bz2 | |
Fixed build for unices
Diffstat (limited to 'src/uscxml')
| -rw-r--r-- | src/uscxml/Factory.cpp | 16 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/CMakeLists.txt | 29 |
2 files changed, 26 insertions, 19 deletions
diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index 667c6f0..84d7632 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -11,7 +11,6 @@ #else # include "uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.h" -# include "uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.h" # include "uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.h" # include "uscxml/plugins/invoker/scxml/USCXMLInvoker.h" # include "uscxml/plugins/invoker/http/HTTPServletInvoker.h" @@ -19,6 +18,10 @@ # include "uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h" # include "uscxml/plugins/invoker/system/SystemInvoker.h" +#ifdef PROTOBUF_FOUND +# include "uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.h" +#endif + # ifdef UMUNDO_FOUND # include "uscxml/plugins/invoker/umundo/UmundoInvoker.h" # include "uscxml/plugins/invoker/vxml/VoiceXMLInvoker.h" @@ -166,6 +169,13 @@ Factory::Factory() { } #endif +#ifdef PROTOBUF_FOUND + { + MMIHTTPIOProcessor* ioProcessor = new MMIHTTPIOProcessor(); + registerIOProcessor(ioProcessor); + } +#endif + // these are always available { NULLDataModel* dataModel = new NULLDataModel(); @@ -199,10 +209,6 @@ Factory::Factory() { BasicHTTPIOProcessor* ioProcessor = new BasicHTTPIOProcessor(); registerIOProcessor(ioProcessor); } - { - MMIHTTPIOProcessor* ioProcessor = new MMIHTTPIOProcessor(); - registerIOProcessor(ioProcessor); - } { SCXMLIOProcessor* ioProcessor = new SCXMLIOProcessor(); registerIOProcessor(ioProcessor); diff --git a/src/uscxml/plugins/datamodel/CMakeLists.txt b/src/uscxml/plugins/datamodel/CMakeLists.txt index 8acbcf7..c1a6961 100644 --- a/src/uscxml/plugins/datamodel/CMakeLists.txt +++ b/src/uscxml/plugins/datamodel/CMakeLists.txt @@ -48,25 +48,26 @@ endif() # XPath datamodel -file(GLOB XPATH_DATAMODEL - xpath/*.cpp - xpath/*.h -) -source_group("Datamodel\\xpath" FILES ${XPATH_DATAMODEL}) -if (BUILD_AS_PLUGINS) - add_library(datamodel_xpath SHARED ${XPATH_DATAMODEL}) - target_link_libraries(datamodel_xpath uscxml) - set_target_properties(datamodel_xpath PROPERTIES FOLDER "Plugin DataModel") -else() - list (APPEND USCXML_FILES ${XPATH_DATAMODEL}) +if (BUILD_DM_XPATH) + file(GLOB XPATH_DATAMODEL + xpath/*.cpp + xpath/*.h + ) + source_group("Datamodel\\xpath" FILES ${XPATH_DATAMODEL}) + if (BUILD_AS_PLUGINS) + add_library(datamodel_xpath SHARED ${XPATH_DATAMODEL}) + target_link_libraries(datamodel_xpath uscxml) + set_target_properties(datamodel_xpath PROPERTIES FOLDER "Plugin DataModel") + else() + list (APPEND USCXML_FILES ${XPATH_DATAMODEL}) + endif() endif() - # GOOGLE V8 ecmascript datamodel #if (NOT APPLE OR IOS) # set(ENV{V8_SRC} ${CMAKE_SOURCE_DIR}/../v8) - if (V8_FOUND) + if (V8_FOUND AND BUILD_DM_ECMA) file(GLOB V8_DATAMODEL ecmascript/v8/*.cpp ecmascript/v8/*.h @@ -97,7 +98,7 @@ endif() # SWI PROLOG datamodel -if (SWI_FOUND) +if (SWI_FOUND AND BUILD_DM_PROLOG) # message(FATAL_ERROR "SWI_INCLUDE_DIR: ${SWI_INCLUDE_DIR}") # if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") |