diff options
| -rw-r--r-- | CMakeLists.txt | 28 | ||||
| -rw-r--r-- | src/uscxml/Factory.cpp | 2 |
2 files changed, 16 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a7b463..bc48b2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -524,19 +524,21 @@ target_link_libraries(uscxml-browser uscxml) set_target_properties(uscxml-browser PROPERTIES FOLDER "Apps") install_executable(TARGETS uscxml-browser COMPONENT tools) -file(GLOB W3C-MMI-COMMON ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/*.cpp ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/*.h) - -file(GLOB_RECURSE W3C-MMI-IM ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/im/*.cpp ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/im/*.h) -add_executable(uscxml-interaction-manager ${W3C-MMI-IM} ${W3C-MMI-COMMON}) -target_link_libraries(uscxml-interaction-manager uscxml) -set_target_properties(uscxml-interaction-manager PROPERTIES FOLDER "Apps") -install_executable(TARGETS uscxml-interaction-manager COMPONENT tools) - -file(GLOB_RECURSE W3C-MMI-MC ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/mc/*.cpp ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/mc/*.h) -add_executable(uscxml-modality-component ${W3C-MMI-MC} ${W3C-MMI-COMMON}) -target_link_libraries(uscxml-modality-component uscxml) -set_target_properties(uscxml-modality-component PROPERTIES FOLDER "Apps") -install_executable(TARGETS uscxml-modality-component COMPONENT tools) +if (PROTOBUF_FOUND) + file(GLOB W3C-MMI-COMMON ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/*.cpp ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/*.h) + + file(GLOB_RECURSE W3C-MMI-IM ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/im/*.cpp ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/im/*.h) + add_executable(uscxml-interaction-manager ${W3C-MMI-IM} ${W3C-MMI-COMMON}) + target_link_libraries(uscxml-interaction-manager uscxml) + set_target_properties(uscxml-interaction-manager PROPERTIES FOLDER "Apps") + install_executable(TARGETS uscxml-interaction-manager COMPONENT tools) + + file(GLOB_RECURSE W3C-MMI-MC ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/mc/*.cpp ${PROJECT_SOURCE_DIR}/apps/w3c-mmi/mc/*.h) + add_executable(uscxml-modality-component ${W3C-MMI-MC} ${W3C-MMI-COMMON}) + target_link_libraries(uscxml-modality-component uscxml) + set_target_properties(uscxml-modality-component PROPERTIES FOLDER "Apps") + install_executable(TARGETS uscxml-modality-component COMPONENT tools) +endif() if (BUILD_TESTS) add_subdirectory(test) diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index 3032c09..cc7eeb3 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -169,7 +169,7 @@ Factory::Factory() { } #endif -#ifdef BUILD_DM_PROLOG +#ifdef BUILD_DM_XPATH { XPathDataModel* dataModel = new XPathDataModel(); registerDataModel(dataModel); |