From 2ea5fd7418486c6585067a94dc1abedd21190201 Mon Sep 17 00:00:00 2001 From: dehnert Date: Wed, 20 Jan 2016 14:41:00 +0100 Subject: [PATCH] fix in sylvan, minor changes to cmake list Former-commit-id: 96adc0c187657ce954008072759cb01542c8f526 --- CMakeLists.txt | 3 +-- resources/3rdparty/sylvan/src/sylvan_mtbdd.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8911a9506..2abc6a992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -549,11 +549,10 @@ message(STATUS "Linking with shipped version of sylvan (in directory ${STORM_SYL include_directories("${Sylvan_INCLUDE_DIR}") list(APPEND STORM_LINK_LIBRARIES "${binary_dir}/src/libsylvan.a") if(${OPERATING_SYSTEM} MATCHES "Linux") - find_package(Hwloc REQUIRED) + find_package(Hwloc QUIET) if(NOT Hwloc_FOUND) message(SEND_ERROR "HWLOC is required but was not found.") else() - message(STATUS "Linking with HWLOC: ${Hwloc_FOUND} ${Hwloc_LIBRARIES}") list(APPEND STORM_LINK_LIBRARIES ${Hwloc_LIBRARIES}) endif() endif() diff --git a/resources/3rdparty/sylvan/src/sylvan_mtbdd.h b/resources/3rdparty/sylvan/src/sylvan_mtbdd.h index 731b5be0f..1a7de3f57 100644 --- a/resources/3rdparty/sylvan/src/sylvan_mtbdd.h +++ b/resources/3rdparty/sylvan/src/sylvan_mtbdd.h @@ -224,7 +224,6 @@ TASK_DECL_3(MTBDD, mtbdd_abstract_op_plus, MTBDD, MTBDD, int); * For Integer/Double MTBDDs, mtbdd_false is interpreted as "0" or "0.0". */ TASK_DECL_2(MTBDD, mtbdd_op_minus, MTBDD*, MTBDD*); -TASK_DECL_3(MTBDD, mtbdd_abstract_op_minus, MTBDD, MTBDD, int); /** * Binary operation Times (for MTBDDs of same type)