Improved import of carl/smtrat

Former-commit-id: d5ead06024

CMakeLists.txt

@@ -608,9 +608,9 @@ endif(ENABLE_Z3)
 if(STORM_HAVE_CARL)
     message(STATUS "StoRM - Linking with carl.")
     include_directories("${carl_INCLUDE_DIR}")
-    target_link_libraries(storm lib_carl)
-    target_link_libraries(storm-functional-tests lib_carl)
-    target_link_libraries(storm-performance-tests lib_carl)
+    target_link_libraries(storm ${carl_LIBRARIES})
+    target_link_libraries(storm-functional-tests ${carl_LIBRARIES})
+    target_link_libraries(storm-performance-tests ${carl_LIBRARIES})
 endif()
 
 #############################################################
@@ -622,9 +622,9 @@ endif()
 if(STORM_HAVE_SMTRAT)
 message(STATUS "StoRM - Linking with smtrat.")
     include_directories("${smtrat_INCLUDE_DIR}")
-    target_link_libraries(storm lib_smtrat)
-    target_link_libraries(storm-functional-tests lib_smtrat)
-    target_link_libraries(storm-performance-tests lib_smtrat)
+    target_link_libraries(storm ${smtrat_LIBRARIES})
+    target_link_libraries(storm-functional-tests ${smtrat_LIBRARIES})
+    target_link_libraries(storm-performance-tests ${smtrat_LIBRARIES})
 endif()
 
 #############################################################

storm-config.h.in

@@ -41,5 +41,8 @@
 // Whether carl is available and to be used.
 #cmakedefine STORM_HAVE_CARL
 
+// Whether smtrat is available and to be used. 
+#cmakedefine STORM_HAVE_SMTRAT
+
 
 #endif // STORM_GENERATED_STORMCONFIG_H_