Merge branch 'jani_support' of https://sselab.de/lab9/private/git/storm into jani_support

Former-commit-id: a2ec4961a4 [formerly 247172ff46]
Former-commit-id: 5189ac56c4

resources/3rdparty/CMakeLists.txt

@@ -331,8 +331,8 @@ add_dependencies(resources sylvan)
 if(${OPERATING_SYSTEM} MATCHES "Linux")
     find_package(Hwloc QUIET REQUIRED)
     if(HWLOC_FOUND)
-        message(STATUS "StoRM - Linking with hwloc ${Hwloc_VERSION}")
-        list(APPEND STORM_LINK_LIBRARIES ${Hwloc_LIBRARIES})
+        message(STATUS "StoRM - Linking with hwloc ${HWLOC_VERSION}")
+        list(APPEND STORM_LINK_LIBRARIES ${HWLOC_LIBRARIES})
     else()
         message(FATAL_ERROR "HWLOC is required but was not found.")
     endif()

src/storage/jani/Property.h

@@ -2,6 +2,8 @@
 
 #include "src/logic/formulas.h"
 #include "src/modelchecker/results/FilterType.h"
+#include "src/logic/Formulas.h"
+
 
 namespace storm {
     namespace jani {