Merge remote-tracking branch 'origin/future' into gspn

Former-commit-id: 7a363d3fa0

resources/3rdparty/CMakeLists.txt

@@ -52,14 +52,6 @@ include_directories(${GMMXX_INCLUDE_DIR})
 set(EIGEN_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/eigen-3.3-beta1")
 include_directories(${EIGEN_INCLUDE_DIR})
 
-#############################################################
-##
-##	gmp
-##
-#############################################################
-
-# GMP is optional (unless MathSAT is used, see below)
-find_package(GMP QUIET)
 
 #############################################################
 ##
@@ -255,6 +247,16 @@ else()
     #TODO: Check if CARL actually requires the use of GiNaC
 endif()
 
+
+#############################################################
+##
+##	gmp
+##
+#############################################################
+
+# GMP is optional (unless MathSAT is used, see below)
+find_package(GMP QUIET)
+
 #############################################################
 ##
 ##	MathSAT (optional)

resources/3rdparty/include_xerces.cmake

@@ -27,5 +27,10 @@ if(USE_XERCES)
     message (STATUS "StoRM - Linking with xercesc")
     set(STORM_HAVE_XERCES ON)
     include_directories(${XERCESC_INCLUDE})
-    list(APPEND STORM_LINK_LIBRARIES ${XERCESC_LIBRARIES})
+    if(APPLE)
+        FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation )
+        FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices )
+    endif()
+    find_package(curl)
+    list(APPEND STORM_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES})
 endif(USE_XERCES)