Merge branch 'master' of https://sselab.de/lab9/private/git/storm

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 # Set project name
 project (storm CXX C)
@@ -152,6 +152,14 @@ add_executable(storm-tests ${STORM_TEST_SOURCES} ${STORM_TEST_HEADERS})
 target_link_libraries(storm ${Boost_LIBRARIES})   
 target_link_libraries(storm-tests ${Boost_LIBRARIES})
 
+# Include Cotire for PCH Generation
+set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/resources/cmake")
+include(cotire)
+
+cotire(storm)
+target_link_libraries(storm_unity ${Boost_LIBRARIES})
+#cotire(storm-tests)
+
 # Add a target to generate API documentation with Doxygen
 if(DOXYGEN_FOUND)
     set(CMAKE_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc")
@@ -179,10 +187,12 @@ endif(GTEST_INCLUDE_DIR)
 if (LOG4CPLUS_INCLUDE_DIR)
     include_directories(${LOG4CPLUS_INCLUDE_DIR})
     target_link_libraries(storm ${LOG4CPLUS_LIBRARIES}) 
+	target_link_libraries(storm_unity ${LOG4CPLUS_LIBRARIES})
     target_link_libraries(storm-tests ${LOG4CPLUS_LIBRARIES})
     # On Linux, we have to link against librt
     if (UNIX AND NOT APPLE)
 	   target_link_libraries(storm rt)
+	   target_link_libraries(storm_unity rt)
 	   target_link_libraries(storm-tests rt)
     endif(UNIX AND NOT APPLE)
 endif(LOG4CPLUS_INCLUDE_DIR)
@@ -190,6 +200,7 @@ endif(LOG4CPLUS_INCLUDE_DIR)
 if (THREADS_FOUND)
 	include_directories(${THREADS_INCLUDE_DIRS})
     target_link_libraries(storm ${CMAKE_THREAD_LIBS_INIT})
+	target_link_libraries(storm_unity ${CMAKE_THREAD_LIBS_INIT})
 	target_link_libraries(storm-tests ${CMAKE_THREAD_LIBS_INIT})
 endif(THREADS_FOUND)
 

src/utility/ConstTemplates.h

@@ -8,6 +8,14 @@
 #ifndef STORM_UTILITY_CONSTTEMPLATES_H_
 #define STORM_UTILITY_CONSTTEMPLATES_H_
 
+#ifdef max
+#	undef max
+#endif
+
+#ifdef min
+#	undef min
+#endif
+
 #include <limits>
 
 namespace storm {