use the correct storm_have_xerces flag now and fixed some wrong file inclusions that now appeared

8 years ago · d5df27c935
8 changed files with 14 additions and 13 deletions
--- 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)
--- 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>

--- 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"
--- 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 {
--- 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();
--- 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"
--- 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 {
--- 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