From 48395f121884256fe2982afb6e986b027a48b91a Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Sun, 29 Mar 2020 16:11:24 +0200 Subject: [PATCH 1/3] Cmake: Fixed capitalization of z3 and hwloc to silence some cmake warnings that recently appear. --- resources/3rdparty/CMakeLists.txt | 2 +- .../cmake/find_modules/{FindHwloc.cmake => FindHWLOC.cmake} | 0 resources/cmake/find_modules/FindZ3.cmake | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename resources/cmake/find_modules/{FindHwloc.cmake => FindHWLOC.cmake} (100%) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 46e927d85..acd1fefd1 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -496,7 +496,7 @@ add_dependencies(sylvan_STATIC sylvan) list(APPEND STORM_DEP_TARGETS sylvan_STATIC) -find_package(Hwloc QUIET REQUIRED) +find_package(HWLOC QUIET REQUIRED) if(HWLOC_FOUND) message(STATUS "Storm - Linking with hwloc ${HWLOC_VERSION}.") add_imported_library(hwloc STATIC ${HWLOC_LIBRARIES} "") diff --git a/resources/cmake/find_modules/FindHwloc.cmake b/resources/cmake/find_modules/FindHWLOC.cmake similarity index 100% rename from resources/cmake/find_modules/FindHwloc.cmake rename to resources/cmake/find_modules/FindHWLOC.cmake diff --git a/resources/cmake/find_modules/FindZ3.cmake b/resources/cmake/find_modules/FindZ3.cmake index d0978b3bc..6c6a7beb1 100644 --- a/resources/cmake/find_modules/FindZ3.cmake +++ b/resources/cmake/find_modules/FindZ3.cmake @@ -32,7 +32,7 @@ set(Z3_SOLVER ${Z3_EXEC}) # set the LIBZ3_FOUND variable by utilizing the following macro # (which also handles the REQUIRED and QUIET arguments) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(z3 DEFAULT_MSG +find_package_handle_standard_args(Z3 DEFAULT_MSG Z3_LIBRARY Z3_INCLUDE_DIR) IF (NOT Z3_FIND_QUIETLY) From 1603f0569de88a81d74d1efb43021aad8ddaf3c3 Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Sun, 29 Mar 2020 20:27:45 +0200 Subject: [PATCH 2/3] Silenced a gcc warning. --- src/storm-cli-utilities/model-handling.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storm-cli-utilities/model-handling.h b/src/storm-cli-utilities/model-handling.h index 0e4fe4812..6dad6fbb0 100644 --- a/src/storm-cli-utilities/model-handling.h +++ b/src/storm-cli-utilities/model-handling.h @@ -276,6 +276,7 @@ namespace storm { case ModelProcessingInformation::ValueType::FinitePrecision: return storm::utility::canHandle(mpi.engine, input.preprocessedProperties.is_initialized() ? input.preprocessedProperties.get() : input.properties, input.model.get()); } + return false; }; mpi.isCompatible = checkCompatibleSettings(); if (!mpi.isCompatible) { From dc7aabc2f1c8a5dd8dd55ba6fcc09bd0e55a593e Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Sun, 29 Mar 2020 20:28:26 +0200 Subject: [PATCH 3/3] Fixed moving a reference away. --- src/storm/settings/SettingsManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storm/settings/SettingsManager.cpp b/src/storm/settings/SettingsManager.cpp index 6a694d09d..da236433c 100644 --- a/src/storm/settings/SettingsManager.cpp +++ b/src/storm/settings/SettingsManager.cpp @@ -404,7 +404,7 @@ namespace storm { STORM_LOG_THROW(moduleIterator == this->modules.end(), storm::exceptions::IllegalFunctionCallException, "Unable to register module '" << moduleSettings->getModuleName() << "' because a module with the same name already exists."); // Take over the module settings object. - std::string const& moduleName = moduleSettings->getModuleName(); + std::string moduleName = moduleSettings->getModuleName(); this->moduleNames.push_back(moduleName); this->modules.emplace(moduleSettings->getModuleName(), std::move(moduleSettings)); auto iterator = this->modules.find(moduleName);