From a183b72604ec4aa8c5cf6719dcaf9989294e9898 Mon Sep 17 00:00:00 2001 From: dehnert Date: Wed, 18 Jan 2017 18:11:15 +0100 Subject: [PATCH] fixed xerces --- resources/3rdparty/include_xerces.cmake | 24 ++--- resources/3rdparty/include_xerces.cmake.save | 0 .../3rdparty/include_xerces.cmake.save.1 | 49 ---------- resources/cmake/find_modules/FindXerces.cmake | 96 ------------------- 4 files changed, 12 insertions(+), 157 deletions(-) delete mode 100644 resources/3rdparty/include_xerces.cmake.save delete mode 100644 resources/3rdparty/include_xerces.cmake.save.1 delete mode 100644 resources/cmake/find_modules/FindXerces.cmake diff --git a/resources/3rdparty/include_xerces.cmake b/resources/3rdparty/include_xerces.cmake index bb60b1537..4a464835d 100644 --- a/resources/3rdparty/include_xerces.cmake +++ b/resources/3rdparty/include_xerces.cmake @@ -1,31 +1,31 @@ if(USE_XERCESC) - find_package(XERCESC QUIET) - if(XERXESC_FOUND) + find_package(XercesC QUIET) + if(XercesC_FOUND) message(STATUS "Storm - Use system version of xerces.") else() message(STATUS "Storm - Use shipped version of xerces.") - set(XERCESC_LIB_DIR ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2/lib) + set(XercesC_LIB_DIR ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2/lib) 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=${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2 --libdir=${XERCESC_LIB_DIR} 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=${XercesC_LIB_DIR} 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 LOG_CONFIGURE ON LOG_BUILD ON LOG_INSTALL ON - BUILD_BYPRODUCTS ${XERCESC_LIB_DIR}/libxerces-c${DYNAMIC_EXT} ${XERCESC_LIB_DIR}/libxerces-c${STATIC_EXT} + BUILD_BYPRODUCTS ${XercesC_LIB_DIR}/libxerces-c${DYNAMIC_EXT} ${XercesC_LIB_DIR}/libxerces-c${STATIC_EXT} ) - set(XERCESC_ROOT ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2) - set(XERCESC_INCLUDE_DIRS ${XERCESC_ROOT}/include) - set(XERCESC_LIBRARY_PATH ${XERCESC_LIB_DIR}) + set(XercesC_ROOT ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2) + set(XercesC_INCLUDE_DIRS ${XercesC_ROOT}/include) + set(XercesC_LIBRARY_PATH ${XercesC_LIB_DIR}) if(BUILD_STATIC) - set(XERCESC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${STATIC_EXT}) + set(XercesC_LIBRARIES ${XercesC_LIBRARY_PATH}/libxerces-c${STATIC_EXT}) else() - set(XERCESC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${DYNAMIC_EXT}) + set(XercesC_LIBRARIES ${XercesC_LIBRARY_PATH}/libxerces-c${DYNAMIC_EXT}) endif() add_dependencies(resources xercesc) @@ -33,7 +33,7 @@ if(USE_XERCESC) message (STATUS "Storm - Linking with xercesc.") set(STORM_HAVE_XERCES ON) - include_directories(${XERCESC_INCLUDE_DIRS}) + include_directories(${XercesC_INCLUDE_DIRS}) if(APPLE) FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation ) FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices ) @@ -41,7 +41,7 @@ if(USE_XERCESC) mark_as_advanced(CORESERVICES_LIBRARY) endif() # find_package(CURL) - list(APPEND STORM_GSPN_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES}) + list(APPEND STORM_GSPN_LINK_LIBRARIES ${XercesC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES}) else() set(STORM_HAVE_XERCES OFF) message (WARNING "Storm - Building without Xerces disables parsing XML formats (for GSPNs)") diff --git a/resources/3rdparty/include_xerces.cmake.save b/resources/3rdparty/include_xerces.cmake.save deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/3rdparty/include_xerces.cmake.save.1 b/resources/3rdparty/include_xerces.cmake.save.1 deleted file mode 100644 index 4480844f5..000000000 --- a/resources/3rdparty/include_xerces.cmake.save.1 +++ /dev/null @@ -1,49 +0,0 @@ -if(USE_XERCESC) - set(XERCESC_FIND_QUIETLY ON) - set(XERCESC_STATIC OFF) - find_package(XercesC QUIET REQUIRED) - if(XERCESC_FOUND) - message(STATUS "Storm - Use system version of xerces.") - else() - message(STATUS "Storm - Use shipped version of xerces.") - set(XERCESC_LIB_DIR ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2/lib) - 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=${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2 --libdir=${XERCESC_LIB_DIR} 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 - LOG_CONFIGURE ON - LOG_BUILD ON - LOG_INSTALL ON - BUILD_BYPRODUCTS ${XERCESC_LIB_DIR}/libxerces-c${DYNAMIC_EXT} ${XERCESC_LIB_DIR}/libxerces-c${STATIC_EXT} - ) - - set(XERCESC_ROOT ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2) - set(XERCESC_INCLUDE ${XERCESC_ROOT}/include) - set(XERCESC_LIBRARY_PATH ${XERCESC_LIB_DIR}) - - if(BUILD_STATIC) - set(XERCESC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${STATIC_EXT}) - else() - set(XERCESC_LIBRARIES ${XERCESC_LIBRARY_PATH}/libxerces-c${DYNAMIC_EXT}) - endif() - - add_dependencies(resources xercesc) - endif() - - message (STATUS "Storm - Linking with xercesc.") - set(STORM_HAVE_XERCES ON) - include_directories(${XERCESC_INCLUDE}) - if(APPLE) - FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation ) - FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices ) - mark_as_advanced(COREFOUNDATION_LIBRARY) - mark_as_advanced(CORESERVICES_LIBRARY) - endif() - find_package(CURL) - list(APPEND STORM_GSPN_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES}) -else() - message (WARNING "Storm - Building without Xerces disables parsing XML formats (for GSPNs)") -endif(USE_XERCESC) diff --git a/resources/cmake/find_modules/FindXerces.cmake b/resources/cmake/find_modules/FindXerces.cmake deleted file mode 100644 index f16483769..000000000 --- a/resources/cmake/find_modules/FindXerces.cmake +++ /dev/null @@ -1,96 +0,0 @@ -# From https://code.google.com/p/libcitygml/source/browse/trunk/CMakeModules/FindXerces.cmake?r=95 -# - Try to find Xerces-C -# Once done this will define -# -# XERCESC_FOUND - system has Xerces-C -# XERCESC_INCLUDE - the Xerces-C include directory -# XERCESC_LIBRARY - Link these to use Xerces-C -# XERCESC_VERSION - Xerces-C found version - -IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) - # in cache already - SET(XERCESC_FIND_QUIETLY TRUE) -ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY) - - -FIND_PATH(XERCESC_INCLUDE NAMES xercesc/util/XercesVersion.hpp - PATHS - $ENV{XERCESC_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} - /usr/local/include - /usr/include -) - -IF (XERCESC_STATIC) - FIND_LIBRARY(XERCESC_LIBRARIES NAMES xerces-c_static_3 xerces-c-3.1 xerces-c - PATHS - $ENV{XERCESC_LIBRARY_DIR} - ${XERCESC_LIBRARY_DIR} - /usr/lib - /usr/local/lib - ) - FIND_LIBRARY(XERCESC_LIBRARIES_DEBUG NAMES xerces-c_static_3D xerces-c-3.1D - PATHS - $ENV{XERCESC_LIBRARY_DIR} - ${XERCESC_LIBRARY_DIR} - /usr/lib - /usr/local/lib - ) - ADD_DEFINITIONS( -DXERCES_STATIC_LIBRARY ) -ELSE (XERCESC_STATIC) - FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_3 - PATHS - $ENV{XERCESC_LIBRARY_DIR} - ${XERCESC_LIBRARY_DIR} - ) - FIND_LIBRARY(XERCESC_LIBRARIES_DEBUG NAMES xerces-c_3D - PATHS - $ENV{XERCESC_LIBRARY_DIR} - ${XERCESC_LIBRARY_DIR} - ) -ENDIF (XERCESC_STATIC) - -IF (XERCESC_INCLUDE AND XERCESC_LIBRARIES) - SET(XERCESC_FOUND TRUE) -ELSE (XERCESC_INCLUDE AND XERCESC_LIBRARIES) - SET(XERCESC_FOUND FALSE) -ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARIES) - -IF(XERCESC_FOUND) - - FIND_PATH(XERCESC_XVERHPPPATH NAMES XercesVersion.hpp PATHS - ${XERCESC_INCLUDE} - PATH_SUFFIXES xercesc/util) - - IF ( ${XERCESC_XVERHPPPATH} STREQUAL XERCESC_XVERHPPPATH-NOTFOUND ) - SET(XERCES_VERSION "0") - ELSE( ${XERCESC_XVERHPPPATH} STREQUAL XERCESC_XVERHPPPATH-NOTFOUND ) - FILE(READ ${XERCESC_XVERHPPPATH}/XercesVersion.hpp XVERHPP) - - STRING(REGEX MATCHALL "\n *#define XERCES_VERSION_MAJOR +[0-9]+" XVERMAJ - ${XVERHPP}) - STRING(REGEX MATCH "\n *#define XERCES_VERSION_MINOR +[0-9]+" XVERMIN - ${XVERHPP}) - STRING(REGEX MATCH "\n *#define XERCES_VERSION_REVISION +[0-9]+" XVERREV - ${XVERHPP}) - - STRING(REGEX REPLACE "\n *#define XERCES_VERSION_MAJOR +" "" - XVERMAJ ${XVERMAJ}) - STRING(REGEX REPLACE "\n *#define XERCES_VERSION_MINOR +" "" - XVERMIN ${XVERMIN}) - STRING(REGEX REPLACE "\n *#define XERCES_VERSION_REVISION +" "" - XVERREV ${XVERREV}) - - SET(XERCESC_VERSION ${XVERMAJ}.${XVERMIN}.${XVERREV}) - - ENDIF ( ${XERCESC_XVERHPPPATH} STREQUAL XERCESC_XVERHPPPATH-NOTFOUND ) - - IF(NOT XERCESC_FIND_QUIETLY) - MESSAGE(STATUS "Found Xerces-C: ${XERCESC_LIBRARY}") - MESSAGE(STATUS " : ${XERCESC_INCLUDE}") - MESSAGE(STATUS " Version: ${XERCESC_VERSION}") - ENDIF(NOT XERCESC_FIND_QUIETLY) -ENDIF(XERCESC_FOUND) - - -MARK_AS_ADVANCED(XERCESC_INCLUDE XERCESC_LIBRARIES)