Skip to content

fix build lib version #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bizulk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix build lib version #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ else()
endif()
endif()

# Set option to let manuallu define XERCESC_NS
set(XERCESC_NS "xercesc_3_1" CACHE STRING "Namespace for XercesC library")

if (XercesC_FOUND)
if(${XercesC_VERSION} VERSION_LESS "3.2")
set(XERCESC_NS "xercesc_3_1")
Expand Down
2 changes: 1 addition & 1 deletion contrib/python/bindings/test-state-pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def main(argv):

import uscxmlNativePython as uscxml

print "Processing" + argv[1]
print("Processing" + argv[1])

interpreter = uscxml.Interpreter.fromURL(argv[1]);
state = interpreter.step()
Expand Down
4 changes: 0 additions & 4 deletions src/uscxml/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
#ifndef COMMON_H_YZ3CIYP
#define COMMON_H_YZ3CIYP

#ifndef XERCESC_NS
#define XERCESC_NS xercesc_3_1
#endif

#ifndef _MSC_VER
#define ELPP_STACKTRACE_ON_CRASH 1
#endif
Expand Down
1 change: 1 addition & 0 deletions src/uscxml/debug/InterpreterIssue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#ifndef INTERPRETERISSUE_H_962CB305
#define INTERPRETERISSUE_H_962CB305

#include "uscxml/config.h"
#include "uscxml/Common.h"

#include <list>
Expand Down
1 change: 1 addition & 0 deletions src/uscxml/interpreter/BasicContentExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <xercesc/framework/MemBufInputSource.hpp>

#include "uscxml/interpreter/Logging.h"
#include "uscxml/config.h"

namespace uscxml {

Expand Down
1 change: 1 addition & 0 deletions src/uscxml/interpreter/BasicContentExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#ifndef BASICCONTENTEXECUTOR_H_B873199D
#define BASICCONTENTEXECUTOR_H_B873199D

#include "uscxml/config.h"
#include "ContentExecutorImpl.h"
#include "uscxml/plugins/ExecutableContent.h"

Expand Down
1 change: 1 addition & 0 deletions src/uscxml/interpreter/InterpreterMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "uscxml/interpreter/Logging.h"
#include "uscxml/debug/InterpreterIssue.h"

#include <functional>
#include <mutex>
#include <functional>

Expand Down
1 change: 1 addition & 0 deletions src/uscxml/messages/Data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <memory>
#include <type_traits>

#include "uscxml/config.h"
#include "uscxml/Common.h"
#include "uscxml/util/Convenience.h"
#include "uscxml/messages/Blob.h"
Expand Down
1 change: 1 addition & 0 deletions src/uscxml/plugins/ExecutableContent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#ifndef EXECUTABLECONTENT_H_1E028A2D
#define EXECUTABLECONTENT_H_1E028A2D

#include "uscxml/config.h"
#include "uscxml/Common.h"

#include <string>
Expand Down
1 change: 1 addition & 0 deletions src/uscxml/util/DOM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <list>
#include <string>

#include "uscxml/config.h"
#include "uscxml/Common.h"
#include <xercesc/util/XMLString.hpp>
#include <xercesc/dom/DOM.hpp>
Expand Down