From 4bd97f940d87d861bec3e124b00936417f0e619d Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Fri, 25 Oct 2013 10:29:11 +0200 Subject: Fixed header refactoring --- CMakeLists.txt | 4 ++++ src/uscxml/plugins/datamodel/null/NULLDataModel.cpp | 2 ++ src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp | 2 ++ src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp | 1 + src/uscxml/plugins/element/fetch/FetchElement.cpp | 2 ++ src/uscxml/plugins/element/file/FileElement.cpp | 1 + src/uscxml/plugins/element/postpone/PostponeElement.cpp | 2 ++ src/uscxml/plugins/invoker/audio/OpenALInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/calendar/CalendarInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp | 2 ++ src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp | 2 ++ src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp | 1 + src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp | 2 ++ 18 files changed, 35 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index db2a840..797244d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -594,6 +594,10 @@ if (OPENSSL_FOUND) list (APPEND USCXML_OPT_LIBS ${OPENSSL_LIBRARIES}) endif() +if (EVENT_SSL_FOUND AND OPENSSL_FOUND) + list (APPEND USCXML_CORE_LIBS ${OPENSSL_LIBRARIES}) +endif() + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(SWI) diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp index 12f2a70..3e690a9 100644 --- a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp +++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "uscxml/Common.h" #include "NULLDataModel.h" diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp index fe93213..5391d68 100644 --- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp +++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "uscxml/Common.h" #include "uscxml/config.h" #include "SWIDataModel.h" diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp index e04271b..35f46ef 100644 --- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp +++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp @@ -22,6 +22,7 @@ #include "uscxml/Message.h" #include +#include #ifdef BUILD_AS_PLUGINS #include diff --git a/src/uscxml/plugins/element/fetch/FetchElement.cpp b/src/uscxml/plugins/element/fetch/FetchElement.cpp index 293fdf9..da64bcf 100644 --- a/src/uscxml/plugins/element/fetch/FetchElement.cpp +++ b/src/uscxml/plugins/element/fetch/FetchElement.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "FetchElement.h" #include diff --git a/src/uscxml/plugins/element/file/FileElement.cpp b/src/uscxml/plugins/element/file/FileElement.cpp index 2237f86..8a2ca8f 100644 --- a/src/uscxml/plugins/element/file/FileElement.cpp +++ b/src/uscxml/plugins/element/file/FileElement.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "uscxml/NameSpacingParser.h" diff --git a/src/uscxml/plugins/element/postpone/PostponeElement.cpp b/src/uscxml/plugins/element/postpone/PostponeElement.cpp index d2b20cb..de2426c 100644 --- a/src/uscxml/plugins/element/postpone/PostponeElement.cpp +++ b/src/uscxml/plugins/element/postpone/PostponeElement.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "PostponeElement.h" #include "uscxml/plugins/invoker/http/HTTPServletInvoker.h" #include diff --git a/src/uscxml/plugins/invoker/audio/OpenALInvoker.cpp b/src/uscxml/plugins/invoker/audio/OpenALInvoker.cpp index ed04ebd..c4e7cf3 100644 --- a/src/uscxml/plugins/invoker/audio/OpenALInvoker.cpp +++ b/src/uscxml/plugins/invoker/audio/OpenALInvoker.cpp @@ -21,6 +21,8 @@ #define _USE_MATH_DEFINES #include +#include + #include "OpenALInvoker.h" #include #include diff --git a/src/uscxml/plugins/invoker/calendar/CalendarInvoker.cpp b/src/uscxml/plugins/invoker/calendar/CalendarInvoker.cpp index e129cd4..c6194c5 100644 --- a/src/uscxml/plugins/invoker/calendar/CalendarInvoker.cpp +++ b/src/uscxml/plugins/invoker/calendar/CalendarInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "CalendarInvoker.h" #include diff --git a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp index 3d25543..67c338d 100644 --- a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp +++ b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "FFMPEGInvoker.h" #include diff --git a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp index 481071c..07f5fcd 100644 --- a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp +++ b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "DirMonInvoker.h" #include diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.cpp b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.cpp index e4db10a..63eb970 100644 --- a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.cpp +++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "OSGInvoker.h" #include "uscxml/URL.h" #include "uscxml/UUID.h" diff --git a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp index ed528b2..498292c 100644 --- a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp +++ b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "HeartbeatInvoker.h" #include diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp index 196211a..1ec6dce 100644 --- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp +++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "MilesSessionInvoker.h" #include diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp index b1776d9..f81f47f 100644 --- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp +++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include "UmundoInvoker.h" #include #include "uscxml/URL.h" diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp index 0952b13..8d694d2 100644 --- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #include #include "XHTMLInvoker.h" #include diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp index 08cc749..dc0e27a 100644 --- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp +++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp @@ -30,6 +30,7 @@ #include #include +#include #ifdef _WIN32 #include diff --git a/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp index d83ea59..cfdfa18 100644 --- a/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp +++ b/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp @@ -17,6 +17,8 @@ * @endcond */ +#include + #ifdef _WIN32 #include #include -- cgit v0.12