Browse Source

Made version check for master14 branch of carl more robust

tempestpy_adaptions
Matthias Volk 6 years ago
parent
commit
425eb4b1a9
  1. 5
      resources/3rdparty/CMakeLists.txt

5
resources/3rdparty/CMakeLists.txt

@ -222,7 +222,7 @@ include(${STORM_3RDPARTY_SOURCE_DIR}/include_cudd.cmake)
set(STORM_HAVE_CARL OFF) set(STORM_HAVE_CARL OFF)
set(CARL_MINVERSION "17.12") set(CARL_MINVERSION "17.12")
set(CARL_C14VERSION "14.1")
set(CARL_C14VERSION "14")
if (NOT STORM_FORCE_SHIPPED_CARL) if (NOT STORM_FORCE_SHIPPED_CARL)
if (NOT "${STORM_CARL_DIR_HINT}" STREQUAL "") if (NOT "${STORM_CARL_DIR_HINT}" STREQUAL "")
find_package(carl QUIET PATHS ${STORM_CARL_DIR_HINT} NO_DEFAULT_PATH) find_package(carl QUIET PATHS ${STORM_CARL_DIR_HINT} NO_DEFAULT_PATH)
@ -240,7 +240,8 @@ if(carl_FOUND AND NOT STORM_FORCE_SHIPPED_CARL)
else() else()
message(SEND_ERROR "File ${carlLOCATION} does not exist, did you build carl?") message(SEND_ERROR "File ${carlLOCATION} does not exist, did you build carl?")
endif() endif()
if("${carl_VERSION_MAJOR}.${carl_VERSION_MINOR}" STREQUAL "${CARL_C14VERSION}")
if("${carl_VERSION_MAJOR}" STREQUAL "${CARL_C14VERSION}")
message(STATUS "Storm - Found carl using master14 branch.")
# empty on purpose. Maybe put a warning here? # empty on purpose. Maybe put a warning here?
elseif("${carl_VERSION_MAJOR}.${carl_VERSION_MINOR}" VERSION_LESS "${CARL_MINVERSION}") elseif("${carl_VERSION_MAJOR}.${carl_VERSION_MINOR}" VERSION_LESS "${CARL_MINVERSION}")
message(SEND_ERROR "Carl outdated, require ${CARL_MINVERSION}, have ${carl_VERSION}") message(SEND_ERROR "Carl outdated, require ${CARL_MINVERSION}, have ${carl_VERSION}")

Loading…
Cancel
Save