From 1d52d577cb04c6a955b80646bee38993b56580e4 Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Wed, 20 Mar 2019 11:44:11 +0100 Subject: [PATCH] Fixed linking with Mathsat on macOS --- CHANGELOG.md | 1 + resources/3rdparty/CMakeLists.txt | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c8b829af..fc6acc2cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ Version 1.3.x - If an option is unknown, Storm now prints a hint to similar option names. - Allow bounded types for constants in JANI. - Fixed sparse bisimulation of MDPs (which failed if all non-absorbing states in the quotient are initial) +- Fixed linking with Mathsat on macOS ### Version 1.3.0 (2018/12) - Slightly improved scheduler extraction diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 152fb9750..b331ed463 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -401,9 +401,15 @@ endif() set(STORM_HAVE_MSAT ${ENABLE_MSAT}) if (ENABLE_MSAT) message (STATUS "Storm - Linking with MathSAT.") - find_library(MSAT_LIB mathsat PATHS "${MSAT_ROOT}/lib") - add_imported_library(msat SHARED ${MSAT_LIB} "${MSAT_ROOT}/include") - list(APPEND STORM_DEP_TARGETS msat_SHARED) + if(${OPERATING_SYSTEM} MATCHES "Linux") + find_library(MSAT_LIB mathsat PATHS "${MSAT_ROOT}/lib") + add_imported_library(msat SHARED ${MSAT_LIB} "${MSAT_ROOT}/include") + list(APPEND STORM_DEP_TARGETS msat_SHARED) + else() + find_library(MSAT_LIB NAMES libmathsat${STATIC_EXT} mathsat PATHS "${MSAT_ROOT}/lib") + add_imported_library(msat STATIC ${MSAT_LIB} "${MSAT_ROOT}/include") + list(APPEND STORM_DEP_TARGETS msat_STATIC) + endif() endif(ENABLE_MSAT) #############################################################