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

Former-commit-id: f31e92df70 [formerly 2524c29fca]
Former-commit-id: 84ff6b58d7

resources/3rdparty/CMakeLists.txt

@@ -330,7 +330,7 @@ add_dependencies(resources sylvan)
 
 if(${OPERATING_SYSTEM} MATCHES "Linux")
     find_package(Hwloc QUIET REQUIRED)
-    if(Hwloc_FOUND)
+    if(HWLOC_FOUND)
         message(STATUS "StoRM - Linking with hwloc ${Hwloc_VERSION}")
         list(APPEND STORM_LINK_LIBRARIES ${Hwloc_LIBRARIES})
     else()