From 7d65bd5e2e54fbdaf5e60f0ef84400d66874357d Mon Sep 17 00:00:00 2001 From: dehnert Date: Fri, 17 Nov 2017 15:57:00 +0100 Subject: [PATCH] fixing carl version check --- resources/3rdparty/CMakeLists.txt | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index f5606a095..d52134a56 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -208,9 +208,7 @@ include(${STORM_3RDPARTY_SOURCE_DIR}/include_cudd.cmake) ############################################################# set(STORM_HAVE_CARL OFF) -set(CARL_MINYEAR 17) -set(CARL_MINMONTH 08) -set(CARL_MINPATCH 0) +set(CARL_MINVERSION "17.08") if (NOT STORM_FORCE_SHIPPED_CARL) if (NOT "${STORM_CARL_DIR_HINT}" STREQUAL "") find_package(carl QUIET PATHS ${STORM_CARL_DIR_HINT} NO_DEFAULT_PATH) @@ -228,20 +226,8 @@ if(carl_FOUND AND NOT STORM_FORCE_SHIPPED_CARL) else() message(SEND_ERROR "File ${carlLOCATION} does not exist, did you build carl?") endif() - if("${carl_MINORYEARVERSION}" STREQUAL "" OR "${carl_MINORMONTHVERSION}" STREQUAL "" OR "${carl_MAINTENANCEVERSION}" STREQUAL "") - # don't have detailed version information, probably an old version of carl - message(FATAL_ERROR "Carl at ${carlLOCATION} outdated, require ${CARL_MINYEAR}.${CARL_MINMONTH}.${CARL_MINPATCH}, have ${carl_VERSION}") - endif() - if(${carl_MINORYEARVERSION} LESS ${CARL_MINYEAR}) - message(SEND_ERROR "Carl outdated, require ${CARL_MINYEAR}.${CARL_MINMONTH}.${CARL_MINPATCH}, have ${carl_VERSION}") - elseif(${carl_MINORYEARVERSION} EQUAL ${CARL_MINYEAR}) - if(${carl_MINORMONTHVERSION} LESS ${CARL_MINMONTH}) - message(SEND_ERROR "Carl outdated, require ${CARL_MINYEAR}.${CARL_MINMONTH}.${CARL_MINPATCH}, have ${carl_VERSION}") - elseif(${carl_MINORMONTHVERSION} EQUAL ${CARL_MINMONTH}) - if(${carl_MAINTENANCEVERSION} LESS ${CARL_MINPATCH}) - message(SEND_ERROR "Carl outdated, require ${CARL_MINYEAR}.${CARL_MINMONTH}.${CARL_MINPATCH}, have ${carl_VERSION}") - endif() - endif() + if("${carl_VERSION}" VERSION_LESS "${CARL_MINVERSION}") + message(SEND_ERROR "Carl outdated, require ${CARL_MINVERSION}, have ${carl_VERSION}") endif() set(STORM_SHIPPED_CARL OFF)