From 50136dd31aca2e8a27e95cb503fb384d3c70657d Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Thu, 18 Jun 2015 17:27:50 +0200
Subject: [PATCH] Improved import of carl/smtrat

Former-commit-id: d5ead060248ed1390c774b8dc70971795d64b876
---
 CMakeLists.txt    | 12 ++++++------
 storm-config.h.in |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79ddf1569..6ae07a267 100644
--- a/CMakeLists.txt
+++ b/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()
 
 #############################################################
diff --git a/storm-config.h.in b/storm-config.h.in
index 94de0014e..c819d3912 100644
--- a/storm-config.h.in
+++ b/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_