Merge branch 'exact_equation_solver' into monolithic-dft

Former-commit-id: fb93ace83a
9 years ago · 2cf42d1acf
2 changed files with 3 additions and 2 deletions
--- a/resources/3rdparty/CMakeLists.txt
+++ b/resources/3rdparty/CMakeLists.txt
@ -2,7 +2,6 @@ add_custom_target(resources)
 add_custom_target(test-resources)

 if(STORM_SUPPORT_XML_INPUT_FORMATS)
-    include(ExternalProject)
    ExternalProject_Add(
            xercesc
            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/xercesc-3.1.2
--- a/storm-version.cpp.in
+++ b/storm-version.cpp.in
@ -1,3 +1,5 @@
+//AUTO GENERATED -- DO NOT CHANGE 
+// TODO resolve issues when placing this in the build order directly.
 #include "src/utility/storm-version.h"

 namespace storm {