From fa49ebb922d200ab5eb12b806e9124d86ed5b57c Mon Sep 17 00:00:00 2001
From: dehnert <dehnert@cs.rwth-aachen.de>
Date: Mon, 6 Feb 2017 21:04:06 +0100
Subject: [PATCH] installing correct libcarl if built from shipped version

---
 CMakeLists.txt                    |  6 +++---
 resources/3rdparty/CMakeLists.txt | 11 +++++------
 src/storm/utility/storm-version.h |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0d00bb29..cd51e1343 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -355,15 +355,15 @@ endif(DOXYGEN_FOUND)
 # If storm is built from an archive, we need to skip the version detection based on git.
 if (STORM_SOURCE STREQUAL "archive")
 	if (NOT DEFINED STORM_VERSION_MAJOR OR NOT DEFINED STORM_VERSION_MINOR OR NOT DEFINED STORM_VERSION_PATCH)
-		message(FATAL_ERROR "storm - Building from archive requires setting a version via cmake.")
+		message(FATAL_ERROR "storm - building from archive requires setting a version via cmake.")
 	endif()
-	message(STATUS "storm - Version is ${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_PATCH} (building from archive).")
+	message(STATUS "storm - version is ${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_PATCH} (building from archive).")
 	set(STORM_VERSION_COMMITS_AHEAD boost::none)
 	set(STORM_VERSION_GIT_HASH boost::none)
 	set(STORM_VERSION_DIRTY boost::none)
 else()
 	if (DEFINED STORM_VERSION_MAJOR OR DEFINED STORM_VERSION_MINOR OR DEFINED STORM_VERSION_PATCH)
-		message(FATAL_ERROR "storm - Building from git does not support setting a version via cmake.")
+		message(FATAL_ERROR "storm - building from git does not support setting a version via cmake.")
 	endif()
 	
 	# Make a version file containing the current version from git.
diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt
index fcadfbdd8..9dcf30aed 100644
--- a/resources/3rdparty/CMakeLists.txt
+++ b/resources/3rdparty/CMakeLists.txt
@@ -229,7 +229,7 @@ if(USE_CARL)
                 BUILD_COMMAND make lib_carl
                 INSTALL_COMMAND make install
                 LOG_BUILD ON
-		LOG_INSTALL ON
+				LOG_INSTALL ON
                 BUILD_BYPRODUCTS ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl${DYNAMIC_EXT}
         )
         include(${STORM_3RDPARTY_BINARY_DIR}/carl/carlConfig.cmake)
@@ -241,8 +241,7 @@ if(USE_CARL)
         set(STORM_HAVE_CARL ON)
         
         # install the carl dynamic library if we build it
-        get_filename_component(STORM_CARL_DYLIB_FULL_PATH ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl${DYNAMIC_EXT} REALPATH)
-        install(FILES ${STORM_CARL_DYLIB_FULL_PATH} DESTINATION lib)
+        install(FILES ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl.1.0.0${DYNAMIC_EXT} DESTINATION lib)
     endif()
     if(STORM_USE_CLN_NUMBERS AND NOT STORM_HAVE_CLN)
 		message(FATAL_ERROR "Cannot use CLN numbers if carl is build without")
@@ -267,7 +266,7 @@ if(USE_SMTRAT)
     	include_directories("${smtrat_INCLUDE_DIR}")
     	list(APPEND STORM_LINK_LIBRARIES ${smtrat_LIBRARIES})
 	else()
-		message(FATAL_ERROR "StoRM - SMT-RAT was requested but not found")
+		message(FATAL_ERROR "storm - SMT-RAT was requested but not found")
 	endif()
 endif()
 
@@ -287,7 +286,7 @@ if(USE_HYPRO)
 		include_directories("${hypro_INCLUDE_DIR}")
 		list(APPEND STORM_LINK_LIBRARIES ${hypro_LIBRARIES})
 	else()
-		message(FATAL_ERROR "StoRM - HyPro was requested but not found")
+		message(FATAL_ERROR "storm - HyPro was requested but not found")
 	endif()
 endif()
 
@@ -493,7 +492,7 @@ if(ENABLE_CUDA)
     if(NOT STORM_CUDA_COMPILE_RESULT_TYPEALIGNMENT)
         message(FATAL_ERROR "storm (CudaPlugin) - Could not test type alignment, there was an Error while compiling the file ${PROJECT_SOURCE_DIR}/cuda/CMakeAlignmentCheck.cpp: ${OUTPUT_TEST_VAR}")
     elseif(STORM_CUDA_RUN_RESULT_TYPEALIGNMENT EQUAL 0)
-        message(STATUS "StoRM (CudaPlugin) - Result of Type Alignment Check: OK.")
+        message(STATUS "storm (CudaPlugin) - Result of Type Alignment Check: OK.")
     else()
         message(FATAL_ERROR "storm (CudaPlugin) - Result of Type Alignment Check: FAILED (Code ${STORM_CUDA_RUN_RESULT_TYPEALIGNMENT})")
     endif()
diff --git a/src/storm/utility/storm-version.h b/src/storm/utility/storm-version.h
index 5c2412670..12bad5c21 100644
--- a/src/storm/utility/storm-version.h
+++ b/src/storm/utility/storm-version.h
@@ -55,7 +55,7 @@ namespace storm {
                     sstream << " build from revision " << gitRevisionHash.get();
                 }
                 if (dirty && dirty.get() == 1) {
-                    sstream << " (DIRTY)";
+                    sstream << " (dirty)";
                 }
                 sstream << "." << std::endl;
                 return sstream.str();