diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/bindings/swig/java/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/uscxml/Factory.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/bindings/swig/java/CMakeLists.txt b/src/bindings/swig/java/CMakeLists.txt index fb02b17..51d67bb 100644 --- a/src/bindings/swig/java/CMakeLists.txt +++ b/src/bindings/swig/java/CMakeLists.txt @@ -12,13 +12,13 @@ endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}) SET(CMAKE_SWIG_FLAGS "") -SET(SCXMLPL_JAVA_PACKAGE "org.uscxml") -SET(SCXMLPL_JAVA_DIR "org/uscxml") +SET(USCXML_JAVA_PACKAGE "org.uscxml") +SET(USCXML_JAVA_DIR "org/uscxml") # we need ; to produce a space with the package .. weird -SET_SOURCE_FILES_PROPERTIES(uscxml.i PROPERTIES SWIG_FLAGS "-w473 -package;${SCXMLPL_JAVA_PACKAGE}") +SET_SOURCE_FILES_PROPERTIES(uscxml.i PROPERTIES SWIG_FLAGS "-w473;-package;${USCXML_JAVA_PACKAGE}") SET_SOURCE_FILES_PROPERTIES(uscxml.i PROPERTIES CPLUSPLUS ON) -SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/${SCXMLPL_JAVA_DIR}") +SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/${USCXML_JAVA_DIR}") set(USCXML_LANGUAGE_BINDINGS "java ${USCXML_LANGUAGE_BINDINGS}") diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index d73e25d..6758e19 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -132,6 +132,10 @@ Factory::Factory() { DataModelImpl* dataModel = (*it)->create(); registerDataModel(dataModel); } + } else { + LOG(ERROR) << "No path to plugins known, export USCXML_PLUGIN_PATH or pass path as parameter"; + Event e; + throw e; } #else #if 1 |