From 002f4128f5f06fd40c7187e7c04cbfddd0b5a9b5 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Wed, 17 Feb 2016 19:02:17 +0100
Subject: [PATCH 1/4] fixed name of variable for storm xml support

Former-commit-id: f9edf588d5c93b82ba9bdae962604b7914c935b4
---
 resources/3rdparty/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt
index 2e3d96146..2d5309ee5 100644
--- a/resources/3rdparty/CMakeLists.txt
+++ b/resources/3rdparty/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_custom_target(resources) 
 add_custom_target(test-resources)
 
-if(STORM_SUPPORT_XML_FORMATS)
+if(STORM_SUPPORT_XML_INPUT_FORMATS)
     include(ExternalProject)
     ExternalProject_Add(
             xercesc

From 3008546623c6d039b2063e12da225a95a13bf3c5 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Wed, 17 Feb 2016 19:02:49 +0100
Subject: [PATCH 2/4] to prevent confusion, explicitely force static builds for
 cudd 2.5.0

Former-commit-id: a41fc373f86d2735f7989fa2214b3e6405c84c42
---
 resources/3rdparty/cudd-2.5.0/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/3rdparty/cudd-2.5.0/CMakeLists.txt b/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
index 5df298c34..27bff3ed9 100644
--- a/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
+++ b/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
@@ -39,4 +39,4 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 endif()
 
 # Add the library
-add_library(cudd ${CUDD_SOURCES} ${CUDD_HEADERS} ${CUDD_HEADERS_CXX} ${CUDD_SOURCES_CXX})
\ No newline at end of file
+add_library(cudd STATIC ${CUDD_SOURCES} ${CUDD_HEADERS} ${CUDD_HEADERS_CXX} ${CUDD_SOURCES_CXX})
\ No newline at end of file

From eaaa36928a72550dac37b238e9a4457e9c18fe2d Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Wed, 17 Feb 2016 19:03:54 +0100
Subject: [PATCH 3/4] prevent xercesc from being linked when no xml support is
 required

Former-commit-id: 63bf3c1a71e1dba88e079d031d91b36facffd007
---
 CMakeLists.txt | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0e325669..9aee1ce75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -521,19 +521,21 @@ endif(ENABLE_MSAT)
 ##
 #############################################################
 
-find_package(Xerces)
-if(NOT XERCES_FOUND)
-	message(STATUS "Use shipped version of xerces")
-	set(XERCES_ROOT ${CMAKE_BINARY_DIR}/resources/3rdparty/xercesc-3.1.2)
-	set(XERCESC_INCLUDE ${XERCES_ROOT}/include)
-	set(XERCES_LIBRARY_PATH ${XERCES_ROOT}/lib)
-	set(XERCESC_LIBRARIES ${XERCES_LIBRARY_PATH}/libxerces-c.a)
-endif()
+if(STORM_SUPPORT_XML_INPUT_FORMATS)
+    find_package(Xerces)
+    if(NOT XERCES_FOUND)
+            message(STATUS "Use shipped version of xerces")
+            set(XERCES_ROOT ${CMAKE_BINARY_DIR}/resources/3rdparty/xercesc-3.1.2)
+            set(XERCESC_INCLUDE ${XERCES_ROOT}/include)
+            set(XERCES_LIBRARY_PATH ${XERCES_ROOT}/lib)
+            set(XERCESC_LIBRARIES ${XERCES_LIBRARY_PATH}/libxerces-c.a)
+    endif()
 
-set(STORM_HAVE_XERCES TRUE)
-if(STORM_HAVE_XERCES)
-	include_directories(${XERCESC_INCLUDE})
-	list(APPEND STORM_LINK_LIBRARIES ${XERCESC_LIBRARIES})
+    set(STORM_HAVE_XERCES TRUE)
+    if(STORM_HAVE_XERCES)
+            include_directories(${XERCESC_INCLUDE})
+            list(APPEND STORM_LINK_LIBRARIES ${XERCESC_LIBRARIES})
+    endif()
 endif()
 
 #############################################################

From 52268103e684573211bd0f91c544567fd0bb9820 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Wed, 17 Feb 2016 19:11:03 +0100
Subject: [PATCH 4/4] use shared version of log4cplus

Former-commit-id: b2f7e5f1fc321909adcb6abc598e8e823888ab21
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9aee1ce75..8104b21d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -589,7 +589,7 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1")
 include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1/include")
 include_directories("${PROJECT_BINARY_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1/include") # This adds the defines.hxx file
 
-list(APPEND STORM_LINK_LIBRARIES log4cplusS)
+list(APPEND STORM_LINK_LIBRARIES log4cplus)
 if (UNIX AND NOT APPLE)
     list(APPEND STORM_LINK_LIBRARIES rt)
 endif(UNIX AND NOT APPLE)