From d5df27c935b8c5f01bcae58c900033b1cc2605cf Mon Sep 17 00:00:00 2001
From: Sebastian Junges <sebastian.junges@rwth-aachen.de>
Date: Fri, 13 Jan 2017 19:35:36 +0100
Subject: [PATCH] use the correct storm_have_xerces flag now and fixed some
 wrong file inclusions that now appeared

---
 resources/3rdparty/include_xerces.cmake               | 1 +
 src/storm-gspn/adapters/XercesAdapter.h               | 2 +-
 src/storm-gspn/parser/GreatSpnEditorProjectParser.cpp | 4 ++--
 src/storm-gspn/parser/GreatSpnEditorProjectParser.h   | 6 +++---
 src/storm-gspn/parser/GspnParser.cpp                  | 2 +-
 src/storm-gspn/parser/PnmlParser.cpp                  | 4 ++--
 src/storm-gspn/parser/PnmlParser.h                    | 6 +++---
 storm-config.h.in                                     | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/resources/3rdparty/include_xerces.cmake b/resources/3rdparty/include_xerces.cmake
index 834f697d2..01440c8b5 100644
--- a/resources/3rdparty/include_xerces.cmake
+++ b/resources/3rdparty/include_xerces.cmake
@@ -43,5 +43,6 @@ if(USE_XERCESC)
     find_package(CURL)
     list(APPEND STORM_GSPN_LINK_LIBRARIES ${XercesC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES})
 else()
+    set(STORM_HAVE_XERCES OFF)
     message (WARNING "Storm - Building without Xerces disables parsing XML formats (for GSPNs)")
 endif(USE_XERCESC)
diff --git a/src/storm-gspn/adapters/XercesAdapter.h b/src/storm-gspn/adapters/XercesAdapter.h
index d6fc4ea65..0a39c8f2e 100644
--- a/src/storm-gspn/adapters/XercesAdapter.h
+++ b/src/storm-gspn/adapters/XercesAdapter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storm-config.h"
-#ifdef USE_XERCES
+#ifdef STORM_HAVE_XERCES
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/util/XMLString.hpp>
 
diff --git a/src/storm-gspn/parser/GreatSpnEditorProjectParser.cpp b/src/storm-gspn/parser/GreatSpnEditorProjectParser.cpp
index ce19a50a9..a1529c053 100644
--- a/src/storm-gspn/parser/GreatSpnEditorProjectParser.cpp
+++ b/src/storm-gspn/parser/GreatSpnEditorProjectParser.cpp
@@ -1,9 +1,9 @@
 #include "GreatSpnEditorProjectParser.h"
-#ifdef USE_XERCES
+#ifdef STORM_HAVE_XERCES
 
 #include <iostream>
 
-#include "storm/adapters/XercesAdapter.h"
+#include "storm-gspn/adapters/XercesAdapter.h"
 
 #include "storm/exceptions/UnexpectedException.h"
 #include "storm/exceptions/WrongFormatException.h"
diff --git a/src/storm-gspn/parser/GreatSpnEditorProjectParser.h b/src/storm-gspn/parser/GreatSpnEditorProjectParser.h
index f594aa993..7c0f5e713 100644
--- a/src/storm-gspn/parser/GreatSpnEditorProjectParser.h
+++ b/src/storm-gspn/parser/GreatSpnEditorProjectParser.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include "storm-config.h"
-#ifdef USE_XERCES
+#ifdef STORM_HAVE_XERCES
 #include <string>
 
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/util/XMLString.hpp>
 
-#include "storm/storage/gspn/GSPN.h"
+#include "storm-gspn/storage/gspn/GSPN.h"
 
-#include "storm/storage/gspn/GspnBuilder.h"
+#include "storm-gspn/storage/gspn/GspnBuilder.h"
 
 namespace storm {
     namespace parser {
diff --git a/src/storm-gspn/parser/GspnParser.cpp b/src/storm-gspn/parser/GspnParser.cpp
index dfb3575d3..b92b6f006 100644
--- a/src/storm-gspn/parser/GspnParser.cpp
+++ b/src/storm-gspn/parser/GspnParser.cpp
@@ -13,7 +13,7 @@ namespace storm {
     namespace parser {
         
         storm::gspn::GSPN* GspnParser::parse(std::string const& filename) {
-#ifdef USE_XERCES
+#ifdef STORM_HAVE_XERCES
                         // initialize xercesc
             try {
                 xercesc::XMLPlatformUtils::Initialize();
diff --git a/src/storm-gspn/parser/PnmlParser.cpp b/src/storm-gspn/parser/PnmlParser.cpp
index 4869405eb..2e15ee588 100644
--- a/src/storm-gspn/parser/PnmlParser.cpp
+++ b/src/storm-gspn/parser/PnmlParser.cpp
@@ -1,9 +1,9 @@
 
 #include "storm-gspn/parser/PnmlParser.h"
-#ifdef USE_XERCES
+#ifdef STORM_HAVE_XERCES
 #include <iostream>
 
-#include "storm/adapters/XercesAdapter.h"
+#include "storm-gspn/adapters/XercesAdapter.h"
 
 #include "storm/exceptions/UnexpectedException.h"
 #include "storm/exceptions/WrongFormatException.h"
diff --git a/src/storm-gspn/parser/PnmlParser.h b/src/storm-gspn/parser/PnmlParser.h
index 8bf5592ae..e4b459eb2 100644
--- a/src/storm-gspn/parser/PnmlParser.h
+++ b/src/storm-gspn/parser/PnmlParser.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include "storm-config.h"
-#ifdef USE_XERCES
+#ifdef STORM_HAVE_XERCES
 #include <string>
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/util/XMLString.hpp>
 
-#include "storm/storage/gspn/GSPN.h"
+#include "storm-gspn/storage/gspn/GSPN.h"
 
-#include "storm/storage/gspn/GspnBuilder.h"
+#include "storm-gspn/storage/gspn/GspnBuilder.h"
 
 namespace storm {
     namespace parser {
diff --git a/storm-config.h.in b/storm-config.h.in
index 074e72d1c..c5884679c 100644
--- a/storm-config.h.in
+++ b/storm-config.h.in
@@ -55,7 +55,7 @@
 
 #cmakedefine STORM_USE_CLN_NUMBERS
 
-#cmakedefine USE_XERCES
+#cmakedefine STORM_HAVE_XERCES
 
 // Whether smtrat is available and to be used. 
 #cmakedefine STORM_HAVE_SMTRAT