Merge remote-tracking branch 'origin/master' into jani-arrays

resources/3rdparty/CMakeLists.txt

@@ -222,6 +222,7 @@ include(${STORM_3RDPARTY_SOURCE_DIR}/include_cudd.cmake)
 
 set(STORM_HAVE_CARL OFF)
 set(CARL_MINVERSION "17.12")
+set(CARL_C14VERSION "14.1")
 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)
@@ -239,7 +240,9 @@ 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_VERSION_MAJOR}.${carl_VERSION_MINOR}" VERSION_LESS "${CARL_MINVERSION}")
+    if("${carl_VERSION_MAJOR}.${carl_VERSION_MINOR}" STREQUAL "${CARL_C14VERSION}")
+        # empty on purpose. Maybe put a warning here?
+    elseif("${carl_VERSION_MAJOR}.${carl_VERSION_MINOR}" VERSION_LESS "${CARL_MINVERSION}")
     	message(SEND_ERROR "Carl outdated, require ${CARL_MINVERSION}, have ${carl_VERSION}")
     endif()