Merge branch 'future' into gspn

Former-commit-id: b9b45039e1

resources/3rdparty/CMakeLists.txt

@@ -186,9 +186,10 @@ endif()
 
 set(STORM_HAVE_CARL OFF)
 if(USE_CARL)
-    find_package(carl QUIET REQUIRED)
+    find_package(carl QUIET)
     if(carl_FOUND)
         set(STORM_HAVE_CARL ON)
+        message(STATUS "StoRM - Use system version of carl")
         message(STATUS "StoRM - Linking with carl ${carl_VERSION_STRING}")
         include_directories("${carl_INCLUDE_DIR}")
         list(APPEND STORM_LINK_LIBRARIES ${carl_LIBRARIES})
@@ -308,6 +309,8 @@ ExternalProject_Add(
         BUILD_IN_SOURCE 0
         INSTALL_COMMAND ""
         INSTALL_DIR "${STORM_3RDPARTY_BINARY_DIR}/sylvan"
+        LOG_CONFIGURE ON
+        LOG_BUILD ON
 )
 ExternalProject_Get_Property(sylvan source_dir)
 ExternalProject_Get_Property(sylvan binary_dir)

resources/3rdparty/carl

@@ -0,0 +1 @@
+Subproject commit d67f986226cf846ba6366cdbe2abc21dff375542

resources/3rdparty/include_xerces.cmake

@@ -7,7 +7,7 @@ if(USE_XERCES)
         ExternalProject_Add(
                 xercesc
                 SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/xercesc-3.1.2
-                CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/xercesc-3.1.2/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/xercesc-3.1.2 --libdir=${CMAKE_CURRENT_BINARY_DIR}/xercesc-3.1.2/lib CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-O3 CXXFLAGS=-O3
+                CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/xercesc-3.1.2/configure --prefix=${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2 --libdir=${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2/lib CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-O3 CXXFLAGS=-O3
                 PREFIX ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2
                 BUILD_COMMAND make
                 BUILD_IN_SOURCE 0