Merge branch 'future' into cudd3

Former-commit-id: a5ac40b951
9 years ago · af6dc174dd
2 changed files with 3 additions and 1 deletions
--- a/resources/3rdparty/CMakeLists.txt
+++ b/resources/3rdparty/CMakeLists.txt
@ -77,4 +77,4 @@ ExternalProject_Get_Property(googletest binary_dir)
 set(GTEST_LIBRARIES ${binary_dir}/libgtest.a ${binary_dir}/libgtest_main.a PARENT_SCOPE)

 add_dependencies(test-resources googletest)
-    
+
--- 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 {