Browse Source

fixed some lower/upper case issue in cmake

tempestpy_adaptions
dehnert 8 years ago
parent
commit
f06deb0407
  1. 16
      resources/3rdparty/include_xerces.cmake

16
resources/3rdparty/include_xerces.cmake

@ -1,6 +1,6 @@
if(USE_XERCESC) if(USE_XERCESC)
find_package(XercesC QUIET)
if(XercesC_FOUND)
find_package(XERCESC QUIET)
if(XERXESC_FOUND)
message(STATUS "Storm - Use system version of xerces.") message(STATUS "Storm - Use system version of xerces.")
else() else()
message(STATUS "Storm - Use shipped version of xerces.") message(STATUS "Storm - Use shipped version of xerces.")
@ -19,13 +19,13 @@ if(USE_XERCESC)
) )
set(XERCESC_ROOT ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2) set(XERCESC_ROOT ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2)
set(XercesC_INCLUDE_DIRS ${XERCESC_ROOT}/include)
set(XERCESC_INCLUDE_DIRS ${XERCESC_ROOT}/include)
set(XERCESC_LIBRARY_PATH ${XERCESC_LIB_DIR}) set(XERCESC_LIBRARY_PATH ${XERCESC_LIB_DIR})
if(BUILD_STATIC) if(BUILD_STATIC)
set(XercesC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${STATIC_EXT})
set(XERCESC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${STATIC_EXT})
else() else()
set(XercesC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${DYNAMIC_EXT})
set(XERCESC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${DYNAMIC_EXT})
endif() endif()
add_dependencies(resources xercesc) add_dependencies(resources xercesc)
@ -33,15 +33,15 @@ if(USE_XERCESC)
message (STATUS "Storm - Linking with xercesc.") message (STATUS "Storm - Linking with xercesc.")
set(STORM_HAVE_XERCES ON) set(STORM_HAVE_XERCES ON)
include_directories(${XercesC_INCLUDE_DIRS})
include_directories(${XERCESC_INCLUDE_DIRS})
if(APPLE) if(APPLE)
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation ) FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation )
FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices ) FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices )
mark_as_advanced(COREFOUNDATION_LIBRARY) mark_as_advanced(COREFOUNDATION_LIBRARY)
mark_as_advanced(CORESERVICES_LIBRARY) mark_as_advanced(CORESERVICES_LIBRARY)
endif() endif()
find_package(CURL)
list(APPEND STORM_GSPN_LINK_LIBRARIES ${XercesC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES})
# find_package(CURL)
list(APPEND STORM_GSPN_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES})
else() else()
set(STORM_HAVE_XERCES OFF) set(STORM_HAVE_XERCES OFF)
message (WARNING "Storm - Building without Xerces disables parsing XML formats (for GSPNs)") message (WARNING "Storm - Building without Xerces disables parsing XML formats (for GSPNs)")

Loading…
Cancel
Save