diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-11 20:39:01 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-11 20:39:01 (GMT) |
| commit | ff5f678aca1aa42d7971b9b5c537286714c805e3 (patch) | |
| tree | f9c2fd60561cb744c0924a85504ceb4dddbdadff | |
| parent | ef551cb937956e2c13570ab3f8f119c48fa5656e (diff) | |
| download | uscxml-ff5f678aca1aa42d7971b9b5c537286714c805e3.zip uscxml-ff5f678aca1aa42d7971b9b5c537286714c805e3.tar.gz uscxml-ff5f678aca1aa42d7971b9b5c537286714c805e3.tar.bz2 | |
Reactivated cotire and some bug-fixes
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | contrib/ctest/common.ctest.inc | 4 | ||||
| -rw-r--r-- | contrib/ctest/hosts/epikur.local.ctest | 6 | ||||
| -rw-r--r-- | src/bindings/swig/java/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/uscxml/Factory.cpp | 4 |
5 files changed, 20 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e7cadc..33c2e7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -765,7 +765,7 @@ endif() if (NOT CMAKE_CROSSCOMPILING) set_target_properties(uscxml PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "src/uscxml/pch.h") set_target_properties(uscxml PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) -# cotire(uscxml) + cotire(uscxml) endif() if (NOT CMAKE_CROSSCOMPILING) @@ -773,7 +773,7 @@ if (NOT CMAKE_CROSSCOMPILING) target_link_libraries(uscxml-browser uscxml) if (NOT CMAKE_CROSSCOMPILING) set_target_properties(uscxml-browser PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) -# cotire(uscxml-browser) + cotire(uscxml-browser) endif() set_target_properties(uscxml-browser PROPERTIES FOLDER "Apps") diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc index beb8cf0..84544bb 100644 --- a/contrib/ctest/common.ctest.inc +++ b/contrib/ctest/common.ctest.inc @@ -46,6 +46,10 @@ if ("$ENV{USCXML_SOURCE_DIR}" STREQUAL "") message(FATAL_ERROR "ENV{USCXML_SOURCE_DIR} is emtpy") endif() +if ("$ENV{USCXML_PLUGIN_PATH}" STREQUAL "") + set(ENV{USCXML_PLUGIN_PATH} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) +endif() + set(CTEST_SOURCE_DIRECTORY $ENV{USCXML_SOURCE_DIR}) set(CTEST_SUBMIT_TYPE $ENV{CTEST_SUBMIT_TYPE}) set(CTEST_BINARY_DIRECTORY "/tmp/build-uscxml-${CTEST_SUBMIT_TYPE}-${CTEST_SCRIPT_NAME}") diff --git a/contrib/ctest/hosts/epikur.local.ctest b/contrib/ctest/hosts/epikur.local.ctest index 2eae8ce..f7d728d 100644 --- a/contrib/ctest/hosts/epikur.local.ctest +++ b/contrib/ctest/hosts/epikur.local.ctest @@ -4,6 +4,11 @@ set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +include("tests/plugins.ctest") +include("common.ctest.inc") + +set(RETAIN_BUILD_DIR OFF) +set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/ecma.ctest") include("common.ctest.inc") @@ -11,3 +16,4 @@ set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/xpath.ctest") include("common.ctest.inc") + 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 |