diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-12-15 15:53:02 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-12-15 15:53:02 (GMT) |
| commit | 75fc3b465fb3d61d36874cf7a29ddbb8256e3817 (patch) | |
| tree | 0015a3cf6296eddc85fbbbf118ddf0d1c2dc8f0e | |
| parent | 7c7b9653f843588ae60d92c6f7d1477d7bbc5f05 (diff) | |
| parent | f00f348c559984f27032413ced4e56ae48bd8214 (diff) | |
| download | uscxml-75fc3b465fb3d61d36874cf7a29ddbb8256e3817.zip uscxml-75fc3b465fb3d61d36874cf7a29ddbb8256e3817.tar.gz uscxml-75fc3b465fb3d61d36874cf7a29ddbb8256e3817.tar.bz2 | |
Merge branch 'master' of github.com:tklab-tud/uscxml
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/uscxml/debug/DebugSession.h | 1 | ||||
| -rw-r--r-- | src/uscxml/util/URL.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d53686..acea546 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -394,6 +394,7 @@ add_library(uscxml ${USCXML_FILES}) set_property(TARGET uscxml PROPERTY CXX_STANDARD 11) set_property(TARGET uscxml PROPERTY CXX_STANDARD_REQUIRED ON) set_property(TARGET uscxml PROPERTY SOVERSION ${USCXML_VERSION}) +install_library(TARGETS uscxml) add_dependencies(uscxml ${USCXML_PREREQS}) target_link_libraries(uscxml ${USCXML_OPT_LIBS} ${USCXML_CORE_LIBS}) @@ -403,6 +404,7 @@ set_property(TARGET uscxml_transform PROPERTY CXX_STANDARD 11) set_property(TARGET uscxml_transform PROPERTY CXX_STANDARD_REQUIRED ON) set_property(TARGET uscxml_transform PROPERTY SOVERSION ${USCXML_VERSION}) target_link_libraries(uscxml_transform uscxml) +install_library(TARGETS uscxml_transform) if (NOT CMAKE_CROSSCOMPILING) enable_testing() diff --git a/src/uscxml/debug/DebugSession.h b/src/uscxml/debug/DebugSession.h index c5ed7e5..9224163 100644 --- a/src/uscxml/debug/DebugSession.h +++ b/src/uscxml/debug/DebugSession.h @@ -28,6 +28,7 @@ #include <set> #include <thread> #include <condition_variable> +#include <mutex> namespace uscxml { diff --git a/src/uscxml/util/URL.h b/src/uscxml/util/URL.h index b3f486a..c83e3b1 100644 --- a/src/uscxml/util/URL.h +++ b/src/uscxml/util/URL.h @@ -30,7 +30,7 @@ #include <list> #include <thread> #include <condition_variable> - +#include <mutex> namespace uscxml { class URL; |