From 61e817cccf5c8e44ff7ed45ca0ff8e94b95f66ab Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 27 Jul 2016 11:16:51 +0200 Subject: [PATCH] apple support for xerces Former-commit-id: 52f7d2e6d8ca414b1e7d5d8935a6f60f59878f49 --- resources/3rdparty/CMakeLists.txt | 18 ++++++++++-------- resources/3rdparty/include_xerces.cmake | 7 ++++++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index c93b5fa7a..a539f8b98 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/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) diff --git a/resources/3rdparty/include_xerces.cmake b/resources/3rdparty/include_xerces.cmake index da33b18c7..9258f66bc 100644 --- a/resources/3rdparty/include_xerces.cmake +++ b/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) \ No newline at end of file